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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

watero-rst-web/src/main/resources/dev-jdbc.properties

@@ -1,13 +1,13 @@
 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 #####
 
-#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
 
 #pool settings
 jdbc.pool.init=1

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

@@ -234,24 +234,6 @@
                     </div>
 
                 </div>
-                <#--<div class="row cl" id="sendbackPresaleAdminDiv" &lt;#&ndash;style="display: none;"&ndash;&gt;>
-                    <div class="formControls col-2 col-sm-2 text-r">
-                        <strong>售前客服</strong>
-                    </div>
-                    <div class="formControls col-4 col-sm-4">
-                        <div style="width: 100%;display: inline-block;margin-right: 10px;">
-                        <span class="select-box">
-                                <select name="sendbackPresaleAdminId" id="sendbackPresaleAdminId" class="select" seleType="send">
-                                    <#if adminlist?? &&  (adminlist?size > 0) >
-                                        <#list adminlist as admin>
-                                            <option value="${admin.adminId!''}" >${admin.adminName!''}</option>
-                                        </#list>
-                                    </#if>
-                                </select>
-                        </span>
-                        </div>
-                    </div>
-                </div>-->
                 <div class="row cl" style="position: relative;" id="backUserInfo">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄回产品</strong>
@@ -365,26 +347,22 @@
                 </div>
             </div>
                 <div class="row cl">
-                    <div class="formControls col-12 col-sm-12">
-                        <div class="formControls col-2 col-sm-2 text-r">
+                    <div class="formControls col-6 col-sm-6">
+                        <div class="formControls col-4 col-sm-4 text-r">
                             <strong>通知售前客服</strong>
                         </div>
                         <div class="radio-box">
-                            <input type="radio" id="tel-Notice1" name="sendbackNoticeCustomers" onclick="noticeCustomer();" checked value="1">
-                            <label for="tel-Notice1">是&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                            <input type="radio" id="tel-Notice3" name="sendbackNoticeCustomers" onclick="noticeCustomer();" checked value="1">
+                            <label for="tel-Notice3">是&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
                         </div>
                         <div class="radio-box">
-                            <input type="radio" id="tel-Notice2" name="sendbackNoticeCustomers" onclick="noticeCustomer();" value="2">
-                            <label for="tel-Notice2">否</label>
+                            <input type="radio" id="tel-Notice4" name="sendbackNoticeCustomers" onclick="noticeCustomer();" value="2">
+                            <label for="tel-Notice4">否</label>
                         </div>
                     </div>
-                </div>
-                <div class="row cl" id="sendbackPresaleAdminDiv" <#--style="display: none;"-->>
-                    <div class="formControls col-2 col-sm-2 text-r">
-                        <strong>售前客服</strong>
-                    </div>
-                    <div class="formControls col-4 col-sm-4">
-                        <div style="width: 100%;display: inline-block;margin-right: 10px;">
+                    <div class="row cl" id="sendbackPresaleAdminDiv2">
+                        <div class="formControls col-4 col-sm-4">
+                            <div style="width: 100%;display: inline-block;margin-right: 10px;">
                         <span class="select-box">
                                 <select name="sendbackPresaleAdminIds" id="sendbackPresaleAdminIds" class="select" seleType="send">
                                     <#if adminlist?? &&  (adminlist?size > 0) >
@@ -394,9 +372,11 @@
                                     </#if>
                                 </select>
                         </span>
+                            </div>
                         </div>
                     </div>
                 </div>
+
                 <div class="row cl" style="position: relative;" id="backUserInfos">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄回产品</strong>
@@ -1436,9 +1416,9 @@
                     $("#sendbackPresaleAdminIds").val(info.sendbackPresaleAdminId);
                     /*$("#sendbackSignTimes").val(info.sendbackSignTime);*/
                     if(info.sendbackNoticeCustomer === 1){
-                        $("#sendbackPresaleAdminDiv").show();
+                        $("#sendbackPresaleAdminDiv2").show();
                     }else if(info.sendbackNoticeCustomer === 2){
-                        $("#sendbackPresaleAdminDiv").hide();
+                        $("#sendbackPresaleAdminDiv2").hide();
                     }
                     $("#productbodyIds").find(".input-prodcueNumber-ids").each(function () {
                         for(var i=0;i<info.listSendbackItem.length;i++){
@@ -3427,11 +3407,17 @@
     
     function  noticeCustomer() {
         var sendbackStatus = parseInt($("input[name='sendbackNoticeCustomer']:checked").val());
+        var sendbackStatuss = parseInt($("input[name='sendbackNoticeCustomers']:checked").val());
         if(sendbackStatus === 1){
           $("#sendbackPresaleAdminDiv").show();
         }else if(sendbackStatus === 2){
           $("#sendbackPresaleAdminDiv").hide();
         }
+        if(sendbackStatuss === 1){
+          $("#sendbackPresaleAdminDiv2").show();
+        }else if(sendbackStatuss === 2){
+          $("#sendbackPresaleAdminDiv2").hide();
+        }
     }
 
 

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

@@ -154,8 +154,8 @@
                         <th>产品市场价（￥）</th>
                         <th>产品折扣价（￥）</th>
                         <th>小结（￥）</th>
-                        <th>成本（￥）</th>
-                        <th>成本小结（￥）</th>
+                        <#--<th>成本（￥）</th>
+                        <th>成本小结（￥）</th>-->
                         <th>未退货数量</th>
                         <th>已退货数量</th>
                         <th>产品总数</th>
@@ -169,8 +169,8 @@
                                 <td>${((item.itemProductPrice/100)?string("0.##"))!''}</td>
                                 <td>${((item.itemProductDiscount/100)?string("0.##"))!''}</td>
                                 <td>${((item.itemTotal/100)?string("0.##"))!''}</td>
-                                <td>${((item.itemCost/100)?string("0.##"))!''}</td>
-                                <td>${((item.itemCostTotal/100)?string("0.##"))!''}</td>
+                                <#--<td>${((item.itemCost/100)?string("0.##"))!''}</td>
+                                <td>${((item.itemCostTotal/100)?string("0.##"))!''}</td>-->
                                 <td>${item.itemNum-item.itemReturnNum}</td>
                                 <td>${item.itemReturnNum}</td>
                                 <td>${item.itemNum}</td>