Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -1084,7 +1084,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 (
@@ -1105,6 +1107,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/resources/dev-jdbc.properties

@@ -1,8 +1,8 @@
 jdbc.driver=com.mysql.jdbc.Driver
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD ####
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=watero_rst
-#jdbc.password=watero_RST
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=watero_rst
+jdbc.password=watero_RST
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD end #####
 
 #\u6D4B\u8BD5
@@ -10,9 +10,9 @@ jdbc.driver=com.mysql.jdbc.Driver
 #jdbc.username=rst_test
 #jdbc.password=RST_test
 
-jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=rst_test
-jdbc.password=RST_test
+#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=rst_test
+#jdbc.password=RST_test
 
 ### \uFFFD\uFFFD\uFFFD\u053B\uFFFD\uFFFD\uFFFD
 #jdbc.url=jdbc:mysql://192.168.1.254/rst_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull

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 = '';

watero-rst-web/src/main/webapp/WEB-INF/views/home/pc_index.ftl

@@ -13,7 +13,7 @@
         .Hui-aside{top:60px;padding-top: 0;background-color: #292f36;width:138px;}
         .container-fluid{padding: 8px 15px;}
         #Hui-userbar{top:8px;}
-        .Hui-article-box{top:59px;}
+        .Hui-article-box{top:58px;}
         .navbar{background: #292f36;}
         .navbar-slogan{font-size: 14px;}
         .Hui-aside .menu_dropdown dt{border-bottom: 0;}
@@ -38,7 +38,7 @@
 <header class="navbar-wrapper">
     <input type="hidden" id="parent_is_login" value="1" placeholder="用于判断是否存在父级页面！">
     <div class="navbar navbar-fixed-top">
-        <div class="container-fluid cl"> <a class="logo navbar-logo f-l mr-10 hidden-xs" href="#"><img src="${path}/common/images/index/admin-login.png" style="height: 44px"/></a> <a class="logo navbar-logo-m f-l mr-10 visible-xs" href="#">Watero-RST</a>
+        <div class="container-fluid cl"> <a class="logo navbar-logo-m f-l mr-10 visible-xs" href="#">Watero-RST</a>
             <span class="logo navbar-slogan f-l mr-10 hidden-xs"></span>
             <a aria-hidden="false" class="nav-toggle Hui-iconfont visible-xs" href="javascript:;">&#xe667;</a>
             <nav id="Hui-userbar" class="nav navbar-nav navbar-userbar hidden-xs">
@@ -58,8 +58,8 @@
     </div>
 </header>
 <aside class="Hui-aside">
-    <div style="text-align: center;padding:0 0 25px 0;"><a class="logo navbar-logo hidden-xs" href="#"><img src="/common/images/index/admin-login.png" style="height: 50px"></a>
-    </div>
+    <#--<div style="text-align: center;padding:0 0 25px 0;"><a class="logo navbar-logo hidden-xs" href="#"><img src="/common/images/index/admin-login.png" style="height: 50px"></a>
+    </div>-->
     <div class="menu_dropdown bk_2">
         <#list menus as m>
             <dl>

watero-rst-web/src/main/webapp/common/static/h-ui.admin/css/H-ui.admin.css

@@ -46,7 +46,7 @@ h4{line-height:30px}
 #Hui-msg .badge{ position:absolute; left:19px; top:4px; font-size:12px; font-weight:normal; padding:1px 5px}
 /*左侧菜单*/
 .Hui-aside .menu_dropdown dl{ margin-bottom:0}
-.Hui-aside .menu_dropdown dt{display:block;line-height:50px;padding-left:25px;cursor:pointer;position:relative;border-bottom: 1px solid #e5e5e5;font-weight:normal}
+.Hui-aside .menu_dropdown dt{display:block;line-height:50px;padding-left:29px;cursor:pointer;position:relative;border-bottom: 1px solid #e5e5e5;font-weight:normal;border-left: 4px solid #292f36;}
 .Hui-aside .menu_dropdown dt .menu_dropdown-arrow{ position:absolute;overflow: hidden; top:0; right:15px;transition-duration:0.3s ;transition-property:all}
 .Hui-aside .menu_dropdown dd{ display:none}
 .Hui-aside .menu_dropdown dt.selected .menu_dropdown-arrow{transform: rotate(180deg)}
@@ -62,7 +62,7 @@ h4{line-height:30px}
 .Hui-aside .menu_dropdown li a:hover{text-decoration:none}
 .Hui-aside .menu_dropdown li.current a,.menu_dropdown li.current a:hover{background-color:#89e4f8;}
 /*菜单收缩切换*/
-.dislpayArrow{position: absolute;top: 0;bottom: 0;left:158px;width:0px; height:100%;z-index:10}
+.dislpayArrow{position: absolute;top: 0;bottom: 0;left:138px;width:0px; height:100%;z-index:10}
 .dislpayArrow a{ position:absolute; display:block; width:17px; height:61px;top:50%; margin-top:-30px;outline:none}
 .dislpayArrow a.open{ background-position:0 -61px}
 .dislpayArrow a:hover{ text-decoration:none; background-position:right 0}