根据签收日期查询

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

@@ -353,7 +353,6 @@
               GROUP BY ss.relation_id
           ) sxx
       ) sx ON sx.customer_id = c.customer_id
-
       LEFT JOIN (
           SELECT
               signclosed_id,
@@ -402,6 +401,7 @@
           GROUP BY
             customer_id
       ) cs ON cs.customer_id = c.customer_id
+      LEFT JOIN tb_rst_cm_relation cr ON cr.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
       LEFT JOIN tb_rst_cm_question_describe qd ON c.customer_id = qd.customer_id
@@ -418,6 +418,7 @@
       LEFT JOIN tb_rst_complaint_detect cd ON c.customer_id = cd.customer_id
       LEFT JOIN tb_rst_cm_tag_info ti ON ti.tag_id = c.customer_tag_id
       LEFT JOIN tb_rst_postage pag ON pag.customer_id = c.customer_id
+      LEFT JOIN tb_rst_sales_order_info oic ON oic.sales_customer_id = c.customer_id
     <where>
       <if test="customerName != null and customerName != ''">
         c.customer_name like CONCAT('%',#{customerName},'%')
@@ -509,10 +510,10 @@
         and cd.detect_state in(32,33,36,37)
       </if>
       <if test="afterState != null and afterState == 7">
-        and cd.detect_state in(33,37,39,27) and cd.detect_placeorder = 1
+        and cd.detect_state in(33,37,39,27) and cd.detect_placeorder = 1 AND (oic.sales_id IS NULL OR oic.sales_status != 1 OR oic.sales_shipping_status != 1)
       </if>
       <if test="afterState != null and afterState == 8">
-        and cd.detect_state in(32,36) and cd.detect_placeorder = 1 AND maintenance_results = 1
+        and cd.detect_state in(32,36) and cd.detect_placeorder = 1 AND maintenance_results = 1 AND (oic.sales_id IS NULL OR oic.sales_status != 1 OR oic.sales_shipping_status != 1)
       </if>
       <if test="afterState != null and afterState == 9">
         and cd.maintenance_cut_time &lt; now()  AND cc.procTypeId = 3 and cd.detect_placeorder = 1  and cd.detect_state = 1
@@ -521,7 +522,10 @@
         and cd.complete_cut_time &lt; now()   AND cc.procTypeId = 3 and cd.detect_placeorder = 1  and detect_state != 32 AND detect_state != 36
       </if>
       <if test="afterState != null and afterState == 11">
-        and  cc.procTypeId = 2  AND cs.signclosed_is_receiving = 2 AND ((soi.sales_shipping_status = 0 and soi.sales_status != 3) OR soi.sales_shipping_status is NULL)
+        and cc.procTypeId = 2
+        AND cs.signclosed_is_receiving = 2
+        AND cr.proc_method_id != 5 AND cr.proc_method_id != 30
+        AND ((soi.sales_shipping_status = 0 and soi.sales_status != 3) OR soi.sales_shipping_status is NULL)
       </if>
       <if test="afterState != null and afterState == 12">
           AND pag.postage_manager_status = 2

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

@@ -2260,6 +2260,14 @@
                     AND tt.sales_distribution_time <![CDATA[<=]]> #{endDate}
                 </if>
             </if>
+            <if test="orderDateType != null and orderDateType == 5">
+                <if test="startDate != null and startDate != ''">
+                    AND tt.sales_sign_time <![CDATA[>=]]> #{startDate}
+                </if>
+                <if test="endDate != null and endDate != ''">
+                    AND tt.sales_sign_time <![CDATA[<=]]> #{endDate}
+                </if>
+            </if>
             <if test="orderIscostTotal != null and orderIscostTotal == 1">
                 AND dco.item_id is not null
             </if>

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

@@ -355,7 +355,7 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
                             //机器故障，待用户确认
                             record.setDetectState(38);
                         }else if(record.getIsMaintenance() == 2){
-                            //机器无故障，待用户确认
+                            // 机器无故障，待用户确认
                             record.setDetectState(37);
                         }
                     }else if(procMethod.getProcMethodIsCharge() == 1){

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -807,12 +807,13 @@
       sum(CASE WHEN (detect_state = 1 AND cpt.proc_type_id = 3) then 1 else 0 end) AS beDetected,
       sum(CASE WHEN detect_state in(24,30,34,38) then 1 else 0 end) AS beConfirmed,
       sum(CASE WHEN detect_state in(32,33,36,37) then 1 else 0 end) AS completeProcessing,
-      sum(CASE WHEN (detect_state in(33,37,39,27) and detect_placeorder = 1) then 1 else 0 end) AS placeOrderNum,
-      sum(CASE WHEN (detect_state in(32,36) and detect_placeorder = 1 AND maintenance_results = 1) then 1 else 0 end) AS detectplaceOrderNum,
+      sum( CASE WHEN ( (detect_state IN ( 33, 37, 39, 27 ) AND detect_placeorder = 1) AND (oi.sales_id IS NULL OR oi.sales_status != 1 OR oi.sales_shipping_status != 1) ) THEN 1 ELSE 0 END ) AS placeOrderNum,
+      sum(CASE WHEN (detect_state in(32,36) and detect_placeorder = 1 AND maintenance_results = 1 AND (oi.sales_id IS NULL OR oi.sales_status != 1 OR oi.sales_shipping_status != 1)) then 1 else 0 end) AS detectplaceOrderNum,
       sum(CASE WHEN (maintenance_cut_time < now() AND cpt.proc_type_id = 3 and detect_placeorder = 1 and detect_state = 1) then 1 else 0 end) AS maintenanceCutTimeNum,
       sum(CASE WHEN (complete_cut_time < now() AND cpt.proc_type_id = 3 and detect_placeorder = 1 and detect_state != 32 AND detect_state != 36) then 1 else 0 end) AS completeCutTimeNum
       FROM
       tb_rst_complaint_detect cd
+      LEFT JOIN tb_rst_sales_order_info oi ON oi.sales_customer_id = cd.customer_id
       LEFT JOIN tb_rst_cm_customer_info ci ON ci.customer_id = cd.customer_id
       LEFT JOIN tb_rst_cm_relation cr on cr.customer_id = cd.customer_id
       LEFT JOIN tb_rst_cm_proc_method cpm ON cpm.proc_method_id = cr.proc_method_id

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedInfoMapper.xml

@@ -453,7 +453,7 @@
     LEFT JOIN tb_rst_cm_proc_type cc ON cc.proc_type_id = tb_rst_cm_proc_method.proc_type_id
     LEFT JOIN tb_rst_complaint_signclosed s on c.customer_id = s.signclosed_customer_id
     LEFT JOIN tb_rst_sales_order_info soi ON soi.sales_customer_id = c.customer_id
-    WHERE cc.proc_type_id = 2 AND s.signclosed_is_receiving = 2 AND ((soi.sales_shipping_status = 0 and soi.sales_status != 3) OR soi.sales_shipping_status is NULL)
+    WHERE cc.proc_type_id = 2 AND cr.proc_method_id != 5 AND cr.proc_method_id != 30 AND s.signclosed_is_receiving = 2 AND ((soi.sales_shipping_status = 0 and soi.sales_status != 3) OR soi.sales_shipping_status is NULL)
     GROUP BY c.customer_id) cs
     <where>
       <if test="adminId != null and adminId != ''" >

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminPostageController.java

@@ -83,8 +83,9 @@ public class AdminPostageController {
         // if(loginAdmin.getAdminDept() == 3 && !loginAdmin.getAdminId().equals(Integer.valueOf(adminid))){//客服
         //if (false) {
             //客服
-            postage.setAdminId(loginAdmin.getAdminId());
-
+            if (Integer.parseInt(adminid) != loginAdmin.getAdminId().intValue()) {
+                postage.setAdminId(loginAdmin.getAdminId());
+            }
             if(companyInfoList != null && companyInfoList.size() > 0){
                 Integer[]  companyIds = new Integer[companyInfoList.size()];
                 for (int m=0;m<companyInfoList.size();m++){

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

@@ -1590,7 +1590,7 @@
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
     var uname = /^[\u4e00-\u9fa5a-zA-Z]{1,12}$/; //中文英文
-    var money = /(^([-]?)[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^([-]?)(0){1}$)|(^([-]?)[0-9]\.[0-9]([0-9])?$)/;//金额
+    var money = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;//金额
     var node = $("#Targetname");
     $(function () {
         if(type === "4"){
@@ -1977,7 +1977,7 @@
         var postageInfo;
         var relationId = $("#relationId").val();
         var postageStatus = parseInt($("input[name='postageStatus']:checked").val());
-        var postageAmount = $("#postageAmount").val()*100;
+        var postageAmount = parseInt(parseFloat($("#postageAmount").val())*100);
         var postageAlipayName = $("#postageAlipayName").val();
         var postageAlipay = $("#postageAlipay").val();
         var postageDesc = $("#postageDesc").val();
@@ -1992,10 +1992,7 @@
             layer.msg("请输入邮费金额!",{icon: 5,time:1000});
             return;
         }
-        if (!money.test(postageAmount)) {
-            layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:1000});
-            return;
-        }
+
         if(postageAlipayName == null || postageAlipayName == ""){
             layer.msg("请输入支付宝姓名!",{icon: 5,time:1000});
             return;

watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/order_statistics.ftl

@@ -111,6 +111,7 @@
                     <option value="2" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 2 >selected="selected"</#if></#if>>打单时间</option>
                     <option value="3" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 3 >selected="selected"</#if></#if>>出库时间</option>
                     <option value="4" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 4 >selected="selected"</#if></#if>>支付时间</option>
+                    <option value="5" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 5 >selected="selected"</#if></#if>>签收时间</option>
                 </select>
 
                 <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 30px;" id="">搜索</button>