修改文档内容3和5两点，其中3主要缺少地址修改。省市区列表慢的问题

2023-10-18 23:23:53 +08:00 · 2023-10-18 23:23:53 +08:00 · c328e4f4c4
parent 4fcdc5a1dc
commit c328e4f4c4
7 changed files with 224 additions and 11 deletions
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java
@ -30,11 +30,12 @@ public class OrderCallRecordController extends BaseController
    @Autowired
    private IOrderCallRecordService orderCallRecordService;

-    @RequiresPermissions("worker:record:view")
+//    @RequiresPermissions("worker:record:view")
    @GetMapping()
-    public String record()
+    public String record(Long orderId, ModelMap mmap)
    {
-        return prefix + "/record";
+        mmap.put("orderId", orderId);
+        return prefix;
    }

    /**
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@ -13,10 +13,7 @@ import com.ghy.common.core.page.PageDomain;
 import com.ghy.common.core.page.TableDataInfo;
 import com.ghy.common.core.page.TableSupport;
 import com.ghy.common.enums.*;
-import com.ghy.common.utils.ExceptionUtil;
-import com.ghy.common.utils.MoneyUtil;
-import com.ghy.common.utils.StringUtils;
-import com.ghy.common.utils.WechatMsgUtils;
+import com.ghy.common.utils.*;
 import com.ghy.common.utils.poi.ExcelUtil;
 import com.ghy.customer.domain.Customer;
 import com.ghy.customer.domain.CustomerAddress;
@ -57,6 +54,7 @@ import org.springframework.web.bind.annotation.*;

 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;

@ -97,6 +95,9 @@ public class OrderMasterController extends BaseController {
    @Autowired
    private CustomerService customerService;

+    @Autowired
+    private IOrderCallRecordService orderCallRecordService;
+
    @Resource
    private FinancialMasterService financialMasterService;
    @Resource
@ -111,8 +112,7 @@ public class OrderMasterController extends BaseController {
    private IAfterServiceRecordService afterServiceRecordService;
    @Resource
    private FinancialChangeRecordService financialChangeRecordService;
-    @Autowired
-    private IOrderCallRecordService orderCallRecordService;
+

 //    @RequiresPermissions("order:master:view")
    @GetMapping()
@ -120,6 +120,20 @@ public class OrderMasterController extends BaseController {
        return prefix;
    }

+    @PostMapping("/changeIsCharge")
+    @ResponseBody
+    public AjaxResult changeIsCharge(OrderMaster orderMaster)
+    {
+        return toAjax(orderMasterService.updateOrderMaster(orderMaster));
+    }
+
+    @PostMapping("/changeIsContact")
+    @ResponseBody
+    public AjaxResult changeIsContact(OrderMaster orderMaster)
+    {
+        return toAjax(orderMasterService.updateOrderMaster(orderMaster));
+    }
+
    /**
     * 修改详细订单
     */
@ -726,6 +740,14 @@ public class OrderMasterController extends BaseController {
                master.setFinancialMasterMoney(fm.getPayMoney());
                master.setFinancialMasterPayMoney(fm.getServerMoney());
            }
+            OrderCallRecord orderCallRecordParam = new OrderCallRecord();
+            orderCallRecordParam.setOrderType("01");
+            orderCallRecordParam.setOrderId(master.getId());
+            List<OrderCallRecord> orderCallRecords = orderCallRecordService.selectOrderCallRecordList(orderCallRecordParam);
+            if(CollectionUtils.isNotEmpty(orderCallRecords)){
+                OrderCallRecord newOne = orderCallRecords.stream().sorted(Comparator.comparing(OrderCallRecord::getCallTime).reversed()).collect(Collectors.toList()).get(0);
+                master.setLastCallTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",newOne.getCallTime()));
+            }
            Goods good = goodsMap.get(master.getGoodsId());
            if (good != null) {
                master.setGoods(good);
--- a/ghy-admin/src/main/resources/templates/order/orderManager.html
+++ b/ghy-admin/src/main/resources/templates/order/orderManager.html
@ -337,6 +337,8 @@
 <script th:inline="javascript">
    var payTypes = [[${@dict.getType('pay_type')}]];
    var orderTypes = [[${@dict.getType('goods_category_type')}]];
+    var orderModes = [[${@dict.getType('order_mode')}]];
+    var payModes = [[${@dict.getType('pay_mode')}]];
    var payStatus = [[${@dict.getType('pay_status')}]];
    var orderStatus = [[${@dict.getType('order_status')}]];

@ -647,6 +649,20 @@
                        return $.table.selectDictLabel(orderStatus, value);
                    }
                },
+                {
+                    title: '挂帐',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return statusTools(row);
+                    }
+                },
+                {
+                    title: '未派联系',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return contactTools(row);
+                    }
+                },
                {
                    field: 'worker',
                    title: '接单信息',
@ -657,12 +673,17 @@
                        }
                    }
                },
+                {
+                    field: 'lastCallTime',
+                    title: '最近联系时间'
+                },
                {
                    title: '操作',
                    align: 'left',
                    formatter: function (value, row, index) {
                        var actions = [];
                        actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-info"></i>查看</a> ');
+                        actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="callDetail(\'' + row.id + '\')"><i class="fa fa-info"></i>拨号详情</a> ');
                        if(row.orderStatus == 0 || row.orderStatus == 1){
                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderMasterReject(\'' + row.id + '\')"></i>主单退单</a> ');
                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderMasterCancel(\'' + row.id + '\')"></i>商家退单</a> ');
@ -692,6 +713,22 @@
                    field: 'changeMoney',
                    title: '商家追加金额',
                    align: 'center'
+                },
+                {
+                    field: 'payMode',
+                    title: '商家付费模式',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(payModes, value);
+                    }
+                },
+                {
+                    field: 'orderMode',
+                    title: '下单模式',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(orderModes, value);
+                    }
                },{
                    field: 'orderType',
                    title: '订单类型',
@ -724,6 +761,50 @@
        $.table.init(options);
    }

+    function statusTools(row) {
+        if (row.isCharge === "01") {
+            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.id + '\')"></i> ';
+        } else {
+            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.id + '\')"></i> ';
+        }
+    }
+
+    /* 用户管理-停用 */
+    function disable(orderId) {
+        $.modal.confirm("确认要取消挂帐吗？", function() {
+            $.operate.post(prefix + "/changeIsCharge", { "id": orderId, "isCharge": "01"});
+        })
+    }
+
+    /* 用户管理启用 */
+    function enable(orderId) {
+        $.modal.confirm("确认要挂帐吗？", function() {
+            $.operate.post(prefix + "/changeIsCharge", { "id": orderId, "isCharge": "02"});
+        })
+    }
+
+    function contactTools(row) {
+        if (row.isContact === "01") {
+            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="contactEnable(\'' + row.id + '\')"></i> ';
+        } else {
+            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="contactDisable(\'' + row.id + '\')"></i> ';
+        }
+    }
+
+    /* 用户管理-停用 */
+    function contactDisable(orderId) {
+        $.modal.confirm("确认未联系吗？", function() {
+            $.operate.post(prefix + "/changeIsContact", { "id": orderId, "isContact": "01"});
+        })
+    }
+
+    /* 用户管理启用 */
+    function contactEnable(orderId) {
+        $.modal.confirm("确认已联系吗？", function() {
+            $.operate.post(prefix + "/changeIsContact", { "id": orderId, "isContact": "02"});
+        })
+    }
+
    function queryParams(params) {
        var search = $.table.queryParams(params);
        Object.assign(search, customParams)
@ -734,6 +815,12 @@
        var url = "order/goods?orderId=" + id;
        $.modal.open("商品信息", url);
    }
+
+    function callDetail(id) {
+        var url = "order/record?orderId=" + id;
+        $.modal.open("拨号记录", url);
+    }
+
    function orderDetailReject(id) {
        $.modal.confirm("确定要退单吗？", function() {
            const url = "detail/reject";
--- a/ghy-admin/src/main/resources/templates/order/record.html
+++ b/ghy-admin/src/main/resources/templates/order/record.html
@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <th:block th:include="include :: header('拨号记录')"/>
+    <th:block th:include="include :: layout-latest-css"/>
+</head>
+
+<body class="gray-bg">
+
+<div class="ui-layout-center">
+    <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="order-goods-form">
+<!--                    <input type="hidden" id="orderId" name="orderId" th:value="${orderMaster.id}">-->
+                </form>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: layout-latest-js"/>
+
+<script th:inline="javascript">
+
+    var prefix = ctx + "order/record";
+    var orderId = '[[${orderId}]]';
+
+    $(function () {
+        var panehHidden = false;
+        if ($(this).width() < 769) {
+            panehHidden = true;
+        }
+        $('body').layout({initClosed: panehHidden, west__size: 185});
+        // 回到顶部绑定
+        if ($.fn.toTop !== undefined) {
+            var opt = {
+                win: $('.ui-layout-center'),
+                doc: $('.ui-layout-center')
+            };
+            $('#scroll-up').toTop(opt);
+        }
+        queryOrderCallList();
+    });
+
+    function queryOrderCallList() {
+        var options = {
+            url: prefix + "/list?orderType=01&orderId=" + orderId,
+            modalName: "拨号记录",
+            search: false,
+            showSearch: false,
+            showToggle: false,
+            showColumns: false,
+            showRefresh: false,
+            columns: [
+                {
+                    field: 'id',
+                    title: 'id',
+                    visible: false
+                },
+                {
+                    field: 'orderId',
+                    title: '订单id',
+                    visible: false
+                },
+                {
+                    field: 'orderType',
+                    title: '单据类型',
+                    visible: false
+                },
+                {
+                    field: 'callTime',
+                    title: '联系时间'
+                }
+            ]
+        };
+        $.table.init(options);
+    }
+
+</script>
+</body>
+
+</html>
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java
@ -29,8 +29,8 @@ public class OrderCallRecord extends BaseEntity
    private String orderType;

    /** 联系时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "联系时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @Excel(name = "联系时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:dd")
    private Date callTime;

 }
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
@ -155,6 +155,10 @@ public class OrderMaster extends BaseEntity {

    private String payMode;

+    private String isCharge;
+
+    private String isContact;
+
    private Integer sysPayStatus;

    /**
@ -171,4 +175,7 @@ public class OrderMaster extends BaseEntity {

    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTimeEnd;
+
+    private String lastCallTime;
+
 }
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@ -13,6 +13,8 @@
        <result property="orderType"         column="order_type"/>
        <result property="orderMode"         column="order_mode"/>
        <result property="payMode"         column="pay_mode"/>
+        <result property="isCharge"         column="is_charge"/>
+        <result property="isContact"         column="is_contact"/>
        <result property="orderStatus"       column="order_status"/>
        <result property="payType"           column="pay_type"/>
        <result property="payStatus"         column="pay_status"/>
@ -44,6 +46,8 @@
               order_type,
               order_mode,
               pay_mode,
+               is_charge,
+               is_contact,
               order_status,
               pay_type,
               pay_status,
@ -73,6 +77,8 @@
               om.order_type,
               om.order_mode,
               om.pay_mode,
+               om.is_charge,
+               om.is_contact,
               om.order_status,
               om.pay_type,
               om.pay_status,
@ -328,6 +334,8 @@
            <if test="resetAllSelfAssigned">all_self_assigned = null,</if>
            <if test="hasDispatchedAll != null">has_dispatched_all = #{hasDispatchedAll},</if>
            <if test="isCall != null">is_call = #{isCall},</if>
+            <if test="isCharge != null">is_charge = #{isCharge},</if>
+            <if test="isContact != null">is_contact = #{isContact},</if>
            <if test="timeout != null">timeout_ = #{timeout},</if>
            update_time = SYSDATE()
        </set>