调整多店铺推送erp问题得处理

fs-admin/src/main/java/com/fs/company/controller/CompanyController.java

@@ -165,7 +165,7 @@ public class CompanyController extends BaseController
     public AjaxResult bindShopCompany(@RequestBody Company company)
     {
         Company companyByStoreId = companyService.selectCompanyByStoreId(company.getStoreId());
-        if (ObjectUtil.isNotEmpty(companyByStoreId)){
+        if (ObjectUtil.isNotEmpty(companyByStoreId)&&!companyByStoreId.getStoreId().equals(company.getStoreId())){
             throw new RuntimeException("此店铺已经绑定了【"+companyByStoreId.getCompanyName()+"】 公司");
         }
         return toAjax(companyService.updateCompany(company));

fs-service/src/main/java/com/fs/erp/service/impl/WdtErpOrderServiceImpl.java

@@ -295,9 +295,9 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
          * 注意：该店铺编号需要与erp进行对应
          */
         if (StringUtils.isNotEmpty(order.getShopNo())){
-            erpWdtBusinessRequestParams.setShopNo(erpconfig.getErpWdShopCode());
-        }else {
             erpWdtBusinessRequestParams.setShopNo(order.getShopNo());
+        }else {
+            erpWdtBusinessRequestParams.setShopNo(erpconfig.getErpWdShopCode());
         }
         erpWdtBusinessRequestParams.setSwitchMode(0);
         ErpWdtTrade erpWdtTrade = new ErpWdtTrade();

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -1775,10 +1775,17 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
 
 
-        //TODO 判定公司是否绑定店铺，绑定则赋值，不绑定则跳过
-
-        //查询出这个订单是哪个公司得，并且拿到绑定店铺id
+            //查询出这个订单是哪个公司得，并且拿到绑定店铺id
         Company company =companyMapper.selectCompanyById(order.getCompanyId());
+
+        //判定公司是否绑定店铺，绑定则赋值，不绑定则跳过
+        if (ObjectUtil.isNotEmpty(company)&&ObjectUtil.isNotEmpty(company.getStoreId())){
+            FsStoreScrm fsStoreScrm = fsStoreMapper.selectFsStoreByStoreId(company.getStoreId());
+            if (ObjectUtil.isNotEmpty(fsStoreScrm)){
+                erpOrder.setShopNo(fsStoreScrm.getStoreNo());
+            }
+        }
+        log.info("进入到erp传入参数erpOrder={}",erpOrder);
         ErpOrderResponse response = erpOrderService.addOrderScrm(erpOrder);
 //        ErpOrderResponse response= k9OrderService.addOmsOrder(order.getId());