系统首页优化

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -291,62 +291,68 @@
     cc.procTypeName as procTypeName,
     cc.customerIsSolve as customerIsSolve,
     cc.procMethodIsBack as procMethodIsBack,
-    cc.procMethodIsSend as procMethodIsSend
+    cc.procMethodIsSend as procMethodIsSend,
+    cc.provinceNumber as customerProvinceId,
+    cc.cityNumber as customerCityId,
+    cc.areaNumber as customerDistrictId
     FROM
     tb_rst_cm_customer_info c
     LEFT JOIN (
-        SELECT
-        xx.*
-        FROM
-        (
-          SELECT
-          tb_rst_cm_proc_method.proc_type_id AS customerIsSolve,
-          tb_rst_cm_relation.relation_id AS relationId,
-          customer_id AS customerId,
-          tb_rst_cm_relation_order.sales_id AS orderId,
-          signclosed_id AS signclosedId,
-          relation_back_status AS relationBackStatus,
-          relation_send_status AS relationSendStatus,
-          relation_send_logistics_no AS relationSendLogisticsNo,
-          relation_send_logistics_company AS relationSendLogisticsCompany,
-          relation_back_logistics_no AS relationBackLogisticsNo,
-          relation_back_logistics_company AS relationBackLogisticsCompany,
-          tb_rst_cm_proc_method.proc_method_id AS procMethodId,
-          tb_rst_cm_proc_method.proc_method_name AS procMethodName,
-          tb_rst_cm_proc_type.proc_type_id AS procTypeId,
-          tb_rst_cm_proc_type.proc_type_name AS procTypeName,
-          tb_rst_cm_proc_method.proc_method_is_back AS procMethodIsBack,
-          tb_rst_cm_proc_method.proc_method_is_send AS procMethodIsSend
-          FROM
-          tb_rst_cm_relation
-          LEFT JOIN tb_rst_cm_proc_method ON tb_rst_cm_proc_method.proc_method_id = tb_rst_cm_relation.proc_method_id
-          LEFT JOIN tb_rst_cm_proc_type ON tb_rst_cm_proc_type.proc_type_id = tb_rst_cm_proc_method.proc_type_id
-          LEFT JOIN tb_rst_cm_relation_order ON tb_rst_cm_relation_order.relation_id = tb_rst_cm_relation.relation_id
-        ) xx
+    SELECT
+    xx.*
+    FROM
+    (
+    SELECT
+    tb_rst_cm_proc_method.proc_type_id AS customerIsSolve,
+    tb_rst_cm_relation.relation_id AS relationId,
+    customer_id AS customerId,
+    tb_rst_cm_relation_order.sales_id AS orderId,
+    signclosed_id AS signclosedId,
+    relation_back_status AS relationBackStatus,
+    relation_send_status AS relationSendStatus,
+    relation_send_logistics_no AS relationSendLogisticsNo,
+    relation_send_logistics_company AS relationSendLogisticsCompany,
+    relation_back_logistics_no AS relationBackLogisticsNo,
+    relation_back_logistics_company AS relationBackLogisticsCompany,
+    tb_rst_cm_proc_method.proc_method_id AS procMethodId,
+    tb_rst_cm_proc_method.proc_method_name AS procMethodName,
+    tb_rst_cm_proc_type.proc_type_id AS procTypeId,
+    tb_rst_cm_proc_type.proc_type_name AS procTypeName,
+    tb_rst_cm_proc_method.proc_method_is_back AS procMethodIsBack,
+    tb_rst_cm_proc_method.proc_method_is_send AS procMethodIsSend,
+    tb_rst_cm_relation.province_number AS provinceNumber,
+    tb_rst_cm_relation.city_number AS cityNumber,
+    tb_rst_cm_relation.area_number AS areaNumber
+    FROM
+    tb_rst_cm_relation
+    LEFT JOIN tb_rst_cm_proc_method ON tb_rst_cm_proc_method.proc_method_id = tb_rst_cm_relation.proc_method_id
+    LEFT JOIN tb_rst_cm_proc_type ON tb_rst_cm_proc_type.proc_type_id = tb_rst_cm_proc_method.proc_type_id
+    LEFT JOIN tb_rst_cm_relation_order ON tb_rst_cm_relation_order.relation_id = tb_rst_cm_relation.relation_id
+    ) xx
     ) cc ON cc.customerId = c.customer_id
     LEFT JOIN (
-      SELECT
-        sxx.*
-      FROM
-      (
-        SELECT ss.* from (
-          select tb_rst_cm_sendback_info.*,tb_rst_cm_relation.customer_id
-          FROM tb_rst_cm_sendback_info
-          LEFT JOIN tb_rst_cm_relation on tb_rst_cm_relation.relation_id = tb_rst_cm_sendback_info.relation_id
-          ORDER BY sendback_create_time desc
-        ) ss
-          GROUP BY ss.relation_id
-      ) sxx
+    SELECT
+    sxx.*
+    FROM
+    (
+    SELECT ss.* from (
+    select tb_rst_cm_sendback_info.*,tb_rst_cm_relation.customer_id
+    FROM tb_rst_cm_sendback_info
+    LEFT JOIN tb_rst_cm_relation on tb_rst_cm_relation.relation_id = tb_rst_cm_sendback_info.relation_id
+    ORDER BY sendback_create_time desc
+    ) ss
+    GROUP BY ss.relation_id
+    ) sxx
     ) sx ON sx.customer_id = c.customer_id
     LEFT JOIN (
-      SELECT ss.*
-      from (
-        select tb_rst_cm_sendback_info.*,tb_rst_cm_relation.customer_id
-        FROM tb_rst_cm_sendback_info
-        LEFT JOIN tb_rst_cm_relation on tb_rst_cm_relation.relation_id = tb_rst_cm_sendback_info.relation_id
-        ORDER BY
-        sendback_create_time desc
-      ) ss
+    SELECT ss.*
+    from (
+    select tb_rst_cm_sendback_info.*,tb_rst_cm_relation.customer_id
+    FROM tb_rst_cm_sendback_info
+    LEFT JOIN tb_rst_cm_relation on tb_rst_cm_relation.relation_id = tb_rst_cm_sendback_info.relation_id
+    ORDER BY
+    sendback_create_time desc
+    ) ss
     ) sss ON sss.customer_id = c.customer_id
     LEFT JOIN tb_rst_cm_visit v ON v.customer_id = c.customer_id
     LEFT JOIN tb_rst_sales_order_info oi ON cc.orderId = oi.sales_id

watero-rst-web/src/main/resources/dev-jdbc.properties

@@ -1,8 +1,8 @@
 jdbc.driver=com.mysql.jdbc.Driver
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD ####
-jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=watero_rst
-jdbc.password=watero_RST
+#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=watero_rst
+#jdbc.password=watero_RST
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD end #####
 
 #\u6D4B\u8BD5
@@ -10,9 +10,9 @@ jdbc.password=watero_RST
 #jdbc.username=rst_test
 #jdbc.password=RST_test
 
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=rst_test
-#jdbc.password=RST_test
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=rst_test
+jdbc.password=RST_test
 
 ### \uFFFD\uFFFD\uFFFD\u053B\uFFFD\uFFFD\uFFFD
 #jdbc.url=jdbc:mysql://192.168.1.254/rst_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -527,7 +527,10 @@
 
             <div class="row cl renewedProduct" id="" style="display: none;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span><span id="relationProduct">寄回产品</span>：</label>
-                <div class="formControls col-9 col-sm-9 text-c" id="produceSelect">
+                    <div class="formControls col-1 col-sm-1">
+                            <button type="button" class="btn btn-primary" id="" onclick="addProduct(1)">添加产品</button>
+                    </div>
+                    <div class="formControls col-9 col-sm-9 text-c" id="produceSelect">
                 </div>
             </div>
 
@@ -580,7 +583,9 @@
 
             <div class="row cl updateProduct" id="" style="display: none;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄出产品：</label>
-                <div class="formControls col-9 col-sm-9" ></div>
+                    <div class="formControls col-1 col-sm-1">
+                            <button type="button" class="btn btn-primary" id="" onclick="addProduct(2)">添加产品</button>
+                    </div>
             </div>
 
             <div class="row cl updateProduct" id="" style="display: none;">

watero-rst-web/src/main/webapp/common/js/salesOrder/salesOrder.js

@@ -123,17 +123,18 @@ function setSelectCustomer(customerId){
         success: function(data){
             if (data.returnCode == 200 && data.returnMsg.customer != null ) {
                 var customer = data.returnMsg.customer;
+                $("#salesOrderStatus").val(2);
                 $("#salesCustomerIdHtml").html("已经选择客诉记录："+customer.customerId);
                 $("#salesCustomerId").val(customer.customerId);
-                /*sc.setCompanyId(customer.companyId);
-                sc.setStoreId(customer.storeId);*/
+                sc.setCompanyId(customer.companyId);
+                sc.setStoreId(customer.storeId);
                 /*设置用户姓名、电话*/
                 $("#salesAddressName").val(customer.customerName);
                 $("#salesAddressTel").val(customer.customerTel);
                 /* 售后订单的支付时间、支付方式默认 */
                 $("#salesPayTime").val(customer.salesTime+" 08:00:00");
                 // sc.setUlcById(0,1,11);
-                // ulc.setUlcByName(0,"省","市","区");
+                 ulc.setUlcById(0,customer.customerProvinceId,customer.customerCityId,customer.customerDistrictId);
             }else{
             }
             $("#salesCustomer").show();