寄出订单关联

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

@@ -299,58 +299,55 @@
         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
+          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
     ) 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) sss ON sss.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
+    ) 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
     LEFT JOIN tb_rst_cm_question_describe qd ON c.customer_id = qd.customer_id
@@ -362,6 +359,7 @@
     LEFT JOIN tb_rst_product_type t ON c.type_id = t.type_id
     LEFT JOIN tb_rst_sys_admin a ON c.admin_id = a.admin_id
     LEFT JOIN tb_rst_sys_admin sa ON v.designated_admin_id = sa.admin_id
+    LEFT JOIN tb_rst_sales_order_info soi ON soi.sales_customer_id = c.customer_id
     <where>
       <if test="customerName != null and customerName != ''">
         c.customer_name like CONCAT('%',#{customerName},'%')
@@ -411,7 +409,11 @@
         and c.customer_create_time &lt; #{endTime}
       </if>
       <if test="sendLogisticsNo != null and sendLogisticsNo != ''">
-        AND  cc.relationSendLogisticsNo =  #{sendLogisticsNo} OR sss.sendback_logistics_no  =  #{sendLogisticsNo}
+        AND  (
+                cc.relationSendLogisticsNo =  #{sendLogisticsNo} OR
+                sss.sendback_logistics_no  =  #{sendLogisticsNo} OR
+                soi.sales_post_num = #{sendLogisticsNo}
+              )
       </if>
       <if test="storeId != null and storeId != ''">
         AND  c.store_id =  #{storeId}

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

@@ -251,7 +251,9 @@
                                 <#if customer.salesOrderList?? &&  (customer.salesOrderList?size > 0)>
                                     寄出：
                                     <#list customer.salesOrderList as salesOrder>
-                                        <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${salesOrder.salesPostNum!''}&billName=${salesOrder.salesPostFirm!''}',300,400);">${salesOrder.salesPostNum!''}</a>,
+                                        <#if salesOrder.salesPostNum??>
+                                            <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${salesOrder.salesPostNum!''}&billName=${salesOrder.salesPostFirm!''}',300,400);">${salesOrder.salesPostNum!''}</a>,
+                                        </#if>
                                     </#list>
                                 <#else>
                                     无