推送erp默认仓库

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

@@ -74,6 +74,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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.stereotype.Service;
 import com.fs.store.mapper.FsStoreOrderMapper;
@@ -183,6 +184,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     private WxPayService wxPayService;
     @Autowired
     private WxPayProperties wxPayProperties;
+    @Value("${fsConfig.erpWarehouseCode}")
+    private String wareHouseCode;
     /**
      * 查询订单
      *
@@ -1405,18 +1408,18 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             erpOrder.setVip_code(order.getUserId().toString());
         }
         erpOrder.setPlatform_code(order.getOrderCode());
-        if(order.getStoreHouseCode()==null){
-            erpOrder.setWarehouse_code("CQDS001");
-        }
-        else{
-            erpOrder.setWarehouse_code(order.getStoreHouseCode());
-        }
-        if(order.getStoreHouseCode().equals("YDSP001")){
-            erpOrder.setShop_code("RunDayWuHan");
-        }
-        else{
+//        if(order.getStoreHouseCode()==null){
+//            erpOrder.setWarehouse_code("CQDS001");
+//        }
+//        else{
+            erpOrder.setWarehouse_code(wareHouseCode);
+//        }
+//        if(order.getStoreHouseCode().equals("YDSP001")){
+//            erpOrder.setShop_code("RunDayWuHan");
+//        }
+//        else{
             erpOrder.setShop_code(sysConfig.getErpShopCode());
-        }
+//        }
 //      erpOrder.setPost_fee(order.getTotalPostage().doubleValue());
         erpOrder.setSeller_memo(order.getMark());
         // order.setCurrency_code("JCZD");

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

@@ -19,6 +19,7 @@ fsConfig:
   erpWdSid: apidevnew2
   erpWdShopCode: beiliyou2-test
   erpWdBaseUrl: https://sandbox.wangdian.cn/openapi2/
+  erpWarehouseCode: beiliyou2-test
   #第三方支付配置
   payOpen: 1
   payPartnerId: 22051909542647100020