Merge remote-tracking branch 'origin/master'

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

@@ -19,6 +19,7 @@ import com.fs.common.event.TemplateBean;
 import com.fs.common.event.TemplateEvent;
 import com.fs.common.event.TemplateListenEnum;
 import com.fs.common.exception.CustomException;
+import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.Company;
@@ -499,11 +500,22 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             storeOrder.setStoreHouseCode("CK01");
             storeOrder.setCompanyId(param.getCompanyId());
             storeOrder.setCompanyUserId(param.getCompanyUserId());
+            //绑定销售
+            FsUser fsuser= userService.selectFsUserById(userId);
             if(param.getCompanyUserId()!=null){
+                if (ObjectUtil.isNotEmpty(fsuser.getCompanyUserId())&&fsuser.getCompanyUserId()!=param.getCompanyUserId()){
+                    CompanyUser companyUser=companyUserService.selectCompanyUserById(fsuser.getCompanyUserId());
+                    return R.error(String.format("请联系%s销售进行购买商品！",companyUser.getNickName()));
+                }else {
+                    fsuser.setCompanyUserId(param.getCompanyUserId());
+                    userService.updateFsUser(fsuser);
+                }
                 CompanyUser companyUser=companyUserService.selectCompanyUserById(param.getCompanyUserId());
                 if(companyUser!=null){
                     storeOrder.setDeptId(companyUser.getDeptId());
                 }
+            }else {
+                storeOrder.setCompanyUserId(fsuser.getCompanyUserId());
             }
             storeOrder.setUserId(userId);
             storeOrder.setOrderCode(orderSn);