近期更改。

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -822,6 +822,12 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                         isMeet1 = true;
                     }else{
                         for(StrategyStore strategyStore : strategy.getListStrategyStore()){
+                            if (salesOrder.getSalesStoreId() == null) {
+                                LoggerFactory.getLogger(SalesOrderServiceImpl.class).info("订单店铺为空");
+                            }
+                            if (strategyStore.getStoreId() == null) {
+                                LoggerFactory.getLogger(SalesOrderServiceImpl.class).info("策略店铺为空");
+                            }
                             if(salesOrder.getSalesStoreId().equals(strategyStore.getStoreId())){
                                 isMeet1 = true;
                             }

watero-rst-service/src/main/java/com/iamberry/rst/service/order/OrderSyncLogServiceImpl.java

@@ -1346,6 +1346,9 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                                 }else if("100239736886".equals(shopIdStr)){
                                     //爱贝源母婴直销店
                                     salesOrder.setSalesStoreId(3);
+                                } else {
+                                    // 水时代专卖店
+                                    salesOrder.setSalesStoreId(157);
                                 }
                                 //深圳爱贝源
                                 salesOrder.setSalesCompanyId(1);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminAfterSaleController.java

@@ -426,7 +426,7 @@ public class AdminAfterSaleController {
         eOrderRequestData.OrderCode = detect.getDetectNumber();
         eOrderRequestData.Cost = (0.00);
         eOrderRequestData.OtherCost = (0.0);
-        eOrderRequestData.PayType = 1;
+        eOrderRequestData.PayType = 3;
         eOrderRequestData.Remark = detectId.toString();
         eOrderRequestData.IsReturnPrintTemplate = 1;
         /* 收件人信息 */
@@ -530,7 +530,7 @@ public class AdminAfterSaleController {
      * @throws IOException
      */
     private void savePostFile(String filePath, String text, String orderId) throws IOException {
-        File dir = new File(filePath + File.separator + "send_order");
+        File dir = new File(filePath + File.separator + "send_order" );
         if (!dir.exists()) {
             dir.mkdir();
         }

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

@@ -325,7 +325,7 @@ function setSelectCustomer(customerId){
                         if(detet.detectState === 32 || detet.detectState === 36 ){
                             detectStateName = "维修完成，待发货";
                         }
-                        if(detet.detectState === 37 ){
+                        if(detet.detectState === 37 || detet.detectState === 33 || detet.detectState === 39){
                             detectStateName = "原机退回，待发货";
                         }
                         if(i === 0){
@@ -347,6 +347,8 @@ function setSelectCustomer(customerId){
                         }
                     }
                     $("#detect_product").html(html);
+                } else {
+                    layer.msg("当前客诉无待发货的维修记录，请核查，若有疑问，请联系技术人员", {icon: 5, time: 3500});
                 }
 
             }else{