user-app 前端未传输companyid时去读数据库

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

@@ -37,6 +37,7 @@ import com.fs.core.config.WxMaConfiguration;
 import com.fs.core.config.WxPayProperties;
 import com.fs.core.utils.OrderCodeUtils;
 import com.fs.course.dto.FsOrderDeliveryNoteDTO;
+import com.fs.course.mapper.FsUserCompanyUserMapper;
 import com.fs.erp.domain.*;
 import com.fs.erp.dto.*;
 import com.fs.erp.mapper.FsErpFinishPushMapper;
@@ -631,15 +632,19 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             //组合数据
             FsStoreOrderScrm storeOrder = new FsStoreOrderScrm();
             storeOrder.setStoreHouseCode("CK01");
-            storeOrder.setCompanyId(param.getCompanyId());
-            storeOrder.setCompanyUserId(param.getCompanyUserId());
-
-
             String json = configService.selectConfigByKey("store.config");
             StoreConfig config= JSONUtil.toBean(json, StoreConfig.class);
 
             //绑定销售
             FsUserScrm fsuser= userService.selectFsUserById(userId);
+
+            if(ObjectUtil.isEmpty(param.getCompanyId())|| ObjectUtil.isEmpty(param.getUseIntegral())){
+                storeOrder.setCompanyId(fsuser.getCompanyId());
+                storeOrder.setCompanyUserId(fsuser.getCompanyUserId());
+            }else{
+                storeOrder.setCompanyId(param.getCompanyId());
+                storeOrder.setCompanyUserId(param.getCompanyUserId());
+            }
             if(ObjectUtil.isNotEmpty(config.getOrderAttribution())
                     &&config.getOrderAttribution().equals(1)){
                 CompanyUserUser map=new CompanyUserUser();