新增发送短信功能

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CmRelation.java

@@ -96,6 +96,11 @@ public class CmRelation implements  Serializable{
     /*订单集合*/
     private List<SalesOrder> salesOrderList = new ArrayList<>();
 
+
+    private Integer procMethodIsBack; //处理方式名称1:需要寄回 2:不需要寄回
+    private Integer procMethodIsSend; //处理方式名称1:需要寄出 2:不需要寄出
+
+
     public Integer getRelationId(){
         return relationId;
     }
@@ -383,4 +388,20 @@ public class CmRelation implements  Serializable{
     public void setSalesOrderList(List<SalesOrder> salesOrderList) {
         this.salesOrderList = salesOrderList;
     }
+
+    public Integer getProcMethodIsBack() {
+        return procMethodIsBack;
+    }
+
+    public void setProcMethodIsBack(Integer procMethodIsBack) {
+        this.procMethodIsBack = procMethodIsBack;
+    }
+
+    public Integer getProcMethodIsSend() {
+        return procMethodIsSend;
+    }
+
+    public void setProcMethodIsSend(Integer procMethodIsSend) {
+        this.procMethodIsSend = procMethodIsSend;
+    }
 }

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

@@ -1082,7 +1082,9 @@ where si.store_id = 23
   <select id="getCmRelationInfo" parameterType="CmRelation" resultType="CmRelation">
     SELECT
     cr.*,
-    sx.sendback_status AS relationBackStatus
+    sx.sendback_status AS relationBackStatus,
+    cpm.proc_method_is_back AS procMethodIsBack,
+    cpm.proc_method_is_send AS procMethodIsSend
     FROM
     tb_rst_cm_relation cr
     LEFT JOIN (
@@ -1103,6 +1105,8 @@ where si.store_id = 23
     ss.relation_id
     ) sxx
     ) sx ON sx.customer_id = cr.customer_id
+    LEFT JOIN tb_rst_cm_proc_method cpm ON cpm.proc_method_id = cr.proc_method_id
+    LEFT JOIN tb_rst_cm_proc_type cpt ON cpt.proc_type_id = cpm.proc_type_id
     <where>
       <if test="relationId != null and relationId != ''">
         cr.relation_id = #{relationId},

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

@@ -636,7 +636,7 @@
         </div>
 
 
-        <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if>>
+        <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if>style="display: none;">
                 <div class="row cl" id="informationInformation">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>收费信息</strong>
@@ -1905,15 +1905,28 @@
                     getCity('cityNumber',relation.provinceNumber);
                     getDistrict('areaNumber',relation.cityNumber);
                     var relationSchedule = '';
-                    switch (relation.relationBackStatus) {
-                        case 1:relationSchedule += '未寄回,';break;
-                        case 2:relationSchedule += '已寄回,';break;
-                        case 3:relationSchedule += '已收货,';break;
+                    if(relation.procMethodIsBack == 1){
+                        switch (relation.relationBackStatus) {
+                            case 1:relationSchedule += '未寄回';break;
+                            case 2:relationSchedule += '已寄回';break;
+                            case 3:relationSchedule += '已收货';break;
+                        }
+                    }
+                    if(relation.procMethodIsBack == 1 && relation.procMethodIsSend == 1){
+                        relationSchedule += ',';
                     }
-                    switch (relation.relationSendStatus) {
-                        case 1:relationSchedule += '未寄出';break;
-                        case 2:relationSchedule += '已寄出';break;
-                        case 3:relationSchedule += '已收货';break;
+                    if(relation.procMethodIsSend == 1) {
+                        switch (relation.relationSendStatus) {
+                            case 1:
+                                relationSchedule += '未寄送';
+                                break;
+                            case 2:
+                                relationSchedule += '已寄送';
+                                break;
+                            case 3:
+                                relationSchedule += '已收货';
+                                break;
+                        }
                     }
 
                     var relationProduct = '';