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

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

@@ -1219,6 +1219,7 @@
               AND t.sales_create_time <![CDATA[<=]]> #{endDate}
           </if>
       </where>
+      ORDER BY t.sales_sales_time DESC
   </select>
 
   <!-- 按照批次查询订单项，并下载，订单列表主要按照订单项来排列 -->

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

@@ -831,7 +831,9 @@ public class AdminOrderController {
                 row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
                 row.add(salesOrder.getSalesDeliverTime() == null ? null:formatter.format(salesOrder.getSalesDeliverTime()));
                 if(salesOrder.getSalesDistributionTime() == null){
-                    row.add(formatter.format(salesOrder.getSalesSendTime()));
+                    if(salesOrder.getSalesSendTime() != null){
+                        row.add(formatter.format(salesOrder.getSalesSendTime()));
+                    }
                 }else{
                     row.add(formatter.format(salesOrder.getSalesDistributionTime()));
                 }

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

@@ -797,6 +797,9 @@
     var ulcRelationAddress = init_address($(".relation_address"));
 
     var sc = $(".sales_channel").initSalesChannel();
+    //回显上朵销售渠道
+    sc.options.companyId = 4;
+    setStore("4",null);
     /*是否是修改页面*/
     var isUpdate = false;
 

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

@@ -788,12 +788,22 @@
             }
         }
     });
-
     /*加载TDS地址信息*/
     var addressUlc = init_address($(".init_address"));
     //处理方式   地址信息
     var ulcRelationAddress = init_address($(".relation_address"));
 
+    var sc = $(".sales_channel").initSalesChannel();
+
+    //回显销售渠道
+    if($("#companyId").val() != null && $("#companyId").val() != ""){
+        $("#selectCompany").val($("#companyId").val());
+        setStore($("#companyId").val(),$("#storeId").val());
+    }else{
+        //回显上朵销售渠道
+        sc.options.companyId = 4;
+        setStore("4",null);
+    }
     var customerId = "${customerInfo.customerId!''}";
 
     /*是否是修改页面*/
@@ -899,25 +909,52 @@
         /*绑定产品类型选择事件*/
         $("input[name='typeId']").change(function (){
             var typeId = parseInt($(this).val());
+            var typeCompany = parseInt($("input:radio[name='typeId']:checked").attr("typeCompany"));
+            $("#selectCompany").val(typeCompany);
+            $("#companyId").val(typeCompany);
+            var isShowTDS = 2;//是否展示tds 1是 2否
             var isOrder = 1;
             switch (typeId){    //1:Soodo电动牙刷   6:WaterO净水机    7：Aiberle净水机    9 ：YULIA净水机
                 case 1:
+                    setStore(typeCompany,null);
                     isOrder = 2;
                     break;
                 case 6:
+                    setStore(typeCompany,null);
                     isOrder = 1;
+                    isShowTDS = 1;
                     break;
                 case 7:
+                    setStore(typeCompany,null);
                     isOrder = 1;
+                    isShowTDS = 1;
                     break;
                 case 9:
+                    setStore(typeCompany,null);
+                    isOrder = 1;
+                    isShowTDS = 1;
+                    break;
+                case 16://诺米克净水机
                     isOrder = 1;
+                    isShowTDS = 1;
+                    setStore(typeCompany,"73");
+                    break;
+                case 17://花作净水机
+                    isOrder = 1;
+                    isShowTDS = 1;
+                    setStore(typeCompany,"75");
                     break;
                 default:
+                    setStore(typeCompany,null);
                     break;
             }
             isNeedSelectOrder = isOrder ;
             initProcessResult(allProcMethodIsBack,allProcMethodIsSend);
+            if(isShowTDS == 1){
+                $("#tdsId").show();
+            }else{
+                $("#tdsId").hide();
+            }
         });
 
         /*监听处理结果选择事件*/

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

@@ -42,12 +42,13 @@
 
         <div class="input-box"  >
             <span class="input-dic spanhidth" style="margin-top: 5px;margin-left: 110px;">快递单号：</span>
-            <input type="text" class="input-text" style="height: 36px;width: 200px;margin-left: 10px;" value="" placeholder="快递单号" id="salesPostNum" name="salesPostNum">
+            <input type="text" class="input-text" style="height: 36px;width: 200px;margin-left: 10px;" value="<#if orderSalesPostFirm??><#if salesId??><#if orderSalesPostFirm == "02">000000${salesId!''}</#if></#if></#if>" placeholder="快递单号" id="salesPostNum" name="salesPostNum">
         </div>
 
         <div style="text-align:center;" >
         <#if salesId??>
             <input type="hidden" value="${salesId!''}" id="salesId" name="salesId">
+
         </#if>
             <button type="button" class="my-btn-submit" onclick="listSalesPostFirm();">确认发货</button>
         </div>

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

@@ -893,7 +893,7 @@ function isConfirm(salesOrderIds,isSplit) {
          *跳转到更正订单页面
          * @param employee
          */
-        function showAfterrulesInfo(salesId) {
+        function acorrect_order(salesId) {
              window.location.href= "${path}/admin/salesOrder/to_acorrect_order?salesId="+salesId;
         }
 

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -378,34 +378,40 @@ function initProduceType(){
                 var typeCompany = parseInt($("input:radio[name='typeId']:checked").attr("typeCompany"));
                 $("#selectCompany").val(typeCompany);
                 $("#companyId").val(typeCompany);
-                setStore(typeCompany,typeId);       //获取店铺
                 var isOrder = 1;
                 var isShowTDS = 2;//是否展示tds 1是 2否
                 switch (typeId){    //1:Soodo电动牙刷   6:WaterO净水机    7：Aiberle净水机    9 ：YULIA净水机
                     case 1:
+                        setStore(typeCompany,null);
                         isOrder = 2;
                         break;
                     case 6:
+                        setStore(typeCompany,null);
                         isOrder = 1;
                         isShowTDS = 1;
                         break;
                     case 7:
+                        setStore(typeCompany,null);
                         isOrder = 1;
                         isShowTDS = 1;
                         break;
                     case 9:
+                        setStore(typeCompany,null);
                         isOrder = 1;
                         isShowTDS = 1;
                         break;
                     case 16://诺米克净水机
                         isOrder = 1;
                         isShowTDS = 1;
+                        setStore(typeCompany,"73");
                         break;
                     case 17://花作净水机
                         isOrder = 1;
                         isShowTDS = 1;
+                        setStore(typeCompany,"75");
                         break;
                     default:
+                        setStore(typeCompany,null);
                         break;
                 }
                 isNeedSelectOrder = isOrder ;
@@ -1304,7 +1310,7 @@ function TDSLinkage(node,maxNumber,minNumber){
 
 
 /*获取销售店铺*/
-function setStore(companyId,typeId){
+function setStore(companyId,storeId){
     $.ajax({
         type: "POST",
         data: {
@@ -1316,19 +1322,14 @@ function setStore(companyId,typeId){
             if (data.returnCode == 200) {
                 for(var i=0;i<data.returnMsg.storeInfoList.length;i++){
                     var storeInfo = data.returnMsg.storeInfoList[i];
-
-                    if(typeId == 16) {
-                        if (storeInfo.storeId == 73) {
-                            $("#store_1").val(storeInfo.storeName);
-                            $("#storeId").val(storeInfo.storeId);
-                        }
-                    }else if(typeId == 17) {
-                        if (storeInfo.storeId == 75) {
+                    if(storeId == null){
+                        if(i == 0){
                             $("#store_1").val(storeInfo.storeName);
                             $("#storeId").val(storeInfo.storeId);
                         }
-                    }else{
-                        if(i == 0){
+                    }
+                    if(storeId == storeInfo.storeId) {
+                        if (storeInfo.storeId == storeId) {
                             $("#store_1").val(storeInfo.storeName);
                             $("#storeId").val(storeInfo.storeId);
                         }