客诉修改

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

@@ -269,12 +269,17 @@
         trsc.company_name companyName,
         trsi.store_name  storeName,
         ci.customer_is_solve customerIsSolve,
-        od.batch_create_time  batchCreateTime
+        od.batch_create_time  batchCreateTime,
+        cpm.proc_method_name procMethodName,
+        cpt.proc_type_name procTypeName
         from tb_rst_sales_order_info
         LEFT JOIN tb_rst_sales_company trsc ON tb_rst_sales_order_info.sales_company_id = trsc.company_id
         LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
         LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
         LEFT JOIN tb_rst_cm_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_cm_relation cr ON ci.customer_id = cr.customer_id
+        LEFT JOIN tb_rst_cm_proc_method cpm ON cr.proc_method_id = cpm.proc_method_id
+        LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id
         LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
         <where>
             tb_rst_sales_order_info.sales_batch_id != 'KS00000000000001'

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

@@ -96,21 +96,7 @@
                         <div>售后订单</div>
                         <div>
                             (
-                            <#if o.customerIsSolve == 1>
-                                已解决
-                            <#elseif o.customerIsSolve == 2>
-                                未解决
-                            <#elseif o.customerIsSolve == 3>
-                                换新
-                            <#elseif o.customerIsSolve == 4>
-                                维修
-                            <#elseif o.customerIsSolve == 5>
-                                补发
-                            <#elseif o.customerIsSolve == 6>
-                                退货
-                            <#elseif o.customerIsSolve == 7>
-                                无理由退货
-                            </#if>
+                                ${(o.procTypeName)!""}
                             )
                         </div>
                     <#else>