客诉修改

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

@@ -150,10 +150,14 @@
         where t.relation_id= #{relationId}
     </select>
 
-    <select id="getCmRelationByCustomerId" resultMap="BaseResultMap" parameterType="Integer" >
+    <select id="getCmRelationByCustomerId" resultType="CmRelation" parameterType="Integer" >
         select
-        <include refid="Base_List" />
+            <include refid="Base_List" />,
+            cpm.proc_method_name,
+            cpt.proc_type_name
         from tb_rst_cm_relation t
+        LEFT JOIN tb_rst_cm_proc_method cpm ON t.proc_method_id = cpm.proc_method_id
+        LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id
         where t.customer_id= #{customerId}
     </select>
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -57,6 +57,8 @@ public class AwaitSendController {
     private StoreInfoService storeInfoService;
     @Autowired
     private CustomerService customerService;
+    @Autowired
+    private CmRelationService cmRelationService;
 
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AwaitSendController.class);

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

@@ -224,6 +224,11 @@
                         <a class="allocation_logistics_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="分配物流" onclick="distribution_express(${order.salesId!''})">
                             <i class="Hui-iconfont">&#xe669;</i>
                         </a>
+
+                        <#--<a class="split_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="拆分订单" onclick="split_order(${order.salesId!''})">-->
+                            <#--<i class="Hui-iconfont">&#xe6ea;</i>-->
+                        <#--</a>-->
+
                         <a class="notice_distribution_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="通知配货" onclick="chooseWarehouse(${order.salesId})">
                             <i class="Hui-iconfont">&#xe62f;</i>
                         </a>