替换顺丰oms code

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

@@ -84,6 +84,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.stereotype.Service;
@@ -215,6 +216,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     @Autowired
     private IFsStoreOrderItemService itemService;
 
+    @Value("${fsConfig.omsCode}")
+    private String deliverOmsCode;
+
     /**
      * 查询订单
      *
@@ -1629,17 +1633,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("CQRXSF.0235487868_241231");
+                //express=expressService.selectFsExpressByOmsCode(deliverOmsCode);
                 if(order.getPayPrice().compareTo(new BigDecimal(100))<=0){
-                    express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
+                    express=expressService.selectFsExpressByOmsCode(deliverOmsCode);
                 }
                 else{
                     boolean found = containsAddress(order.getUserAddress());
                     if(found){
-                        express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
+                        express=expressService.selectFsExpressByOmsCode(deliverOmsCode);
                     }
                     else{
-                        express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
+                        express=expressService.selectFsExpressByOmsCode(deliverOmsCode);
                     }
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
@@ -1660,7 +1664,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     if(StringUtils.isNotEmpty(company.getOmsCode())){
                         express = expressService.selectFsExpressByOmsCode(company.getOmsCode());
                     }else{
-                        express = expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
+                        express = expressService.selectFsExpressByOmsCode(deliverOmsCode);
                     }
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
@@ -1678,14 +1682,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("CQRXSF.0235487868_241231");
+                    express=expressService.selectFsExpressByOmsCode(deliverOmsCode);
                 }else{
                     boolean found = containsAddress(order.getUserAddress());
                     if(found){
-                        express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
+                        express=expressService.selectFsExpressByOmsCode(deliverOmsCode);
                     }
                     else{
-                        express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
+                        express=expressService.selectFsExpressByOmsCode(deliverOmsCode);
                     }
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
@@ -1704,7 +1708,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     express=expressService.selectFsExpressByOmsCode("EMS.1");
                 }
                 else {
-                    express=expressService.selectFsExpressByOmsCode("CQRXSF.0235487868_241231");
+                    express=expressService.selectFsExpressByOmsCode(deliverOmsCode);
                 }
                 erpOrder.setExpress_code(express.getOmsCode());
                 order.setDeliveryName(express.getName());

fs-service-system/src/main/resources/application-config.yml

@@ -1,5 +1,6 @@
 #配置
 fsConfig:
+  omsCode: 'wjdh.SF.0235496817'
   #快递鸟
   kdnId: 1881217
   kdnKeyId: a43fee18-3ea9-4eff-99c0-7e94618d7a57