物流

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -1471,8 +1471,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         //1.新疆、西藏、内蒙古、海南的订单(代收+非代收）全部发EMS
         //2.全款订单选择中通，快递ID 452  ZTO 中通商城标快 ZTBK.17782167502
         //3.新疆  西藏 内蒙古 海南  全款订单走顺丰丰云配  【非全款】的就根据公司配置那来 配的哪个走哪个快递
-        //4.把现在发中通的规则改成发顺丰风云配 SF.0235488558_241101
-        //5.全款支付且应付金额小于等于100元，快递方式默认中通小件455 ZTO 中通小件 SF.0235488558_241101
+        //4.把现在发中通的规则改成发顺丰风云配 CQRXSF.0235487868_241231
+        //5.全款支付且应付金额小于等于100元，快递方式默认中通小件455 ZTO 中通小件 CQRXSF.0235487868_241231
         if(order.getCompanyId()!=null&&order.getStoreHouseCode()!=null&&order.getStoreHouseCode().equals("WHSP001")){
             //杭州家有仙妻实业有限公司 全部订单快递方式设置为商城德邦快递
             FsExpress express=expressService.selectFsExpressByOmsCode("SF-WHC");
@@ -1495,17 +1495,17 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             Company company = companyService.selectCompanyById(order.getCompanyId());
             if (order.getPayDelivery().compareTo(new BigDecimal(0)) == 0) {  //没有物流代收(全款订单)
                 FsExpress express = new FsExpress();
-                //express=expressService.selectFsExpressByOmsCode("SF.0235488558_241101");
+                //express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
                 if(order.getPayPrice().compareTo(new BigDecimal(100))<=0){
-                    express=expressService.selectFsExpressByOmsCode("SF.0235488558_241101");
+                    express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
                 }
                 else{
                     boolean found = containsAddress(order.getUserAddress());
                     if(found){
-                        express=expressService.selectFsExpressByOmsCode("SF.0235488558_241101");
+                        express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
                     }
                     else{
-                        express=expressService.selectFsExpressByOmsCode("SF.0235488558_241101");
+                        express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
                     }
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
@@ -1526,7 +1526,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     if(StringUtils.isNotEmpty(company.getOmsCode())){
                         express = expressService.selectFsExpressByOmsCode(company.getOmsCode());
                     }else{
-                        express = expressService.selectFsExpressByOmsCode("SF.0235488558_241101");
+                        express = expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
                     }
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
@@ -1544,14 +1544,14 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             if(order.getPayDelivery().compareTo(new BigDecimal(0))==0){  //没有物流代收(全款订单)
                 FsExpress express=new FsExpress();
                 if(order.getPayPrice().compareTo(new BigDecimal(100))<=0){
-                    express=expressService.selectFsExpressByOmsCode("SF.0235488558_241101");
+                    express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
                 }else{
                     boolean found = containsAddress(order.getUserAddress());
                     if(found){
-                        express=expressService.selectFsExpressByOmsCode("SF.0235488558_241101");
+                        express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
                     }
                     else{
-                        express=expressService.selectFsExpressByOmsCode("SF.0235488558_241101");
+                        express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
                     }
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
@@ -1570,7 +1570,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     express=expressService.selectFsExpressByOmsCode("EMS.1");
                 }
                 else {
-                    express=expressService.selectFsExpressByOmsCode("SF.0235488558_241101");
+                    express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
                 order.setDeliveryName(express.getName());