会员在一个销售那里下过单，那么这个会员就和销售绑定，之后不管是用户自主下单，也会绑定为该销售的订

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

@@ -500,22 +500,22 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             storeOrder.setStoreHouseCode("CK01");
             storeOrder.setCompanyId(param.getCompanyId());
             storeOrder.setCompanyUserId(param.getCompanyUserId());
-
-            //TODO 绑定销售 需调整位置
+            //绑定销售
             FsUser fsuser= userService.selectFsUserById(userId);
-            if (ObjectUtil.isNotEmpty(fsuser.getCompanyUserId())&&fsuser.getCompanyUserId()==param.getCompanyUserId()){
-                throw new ServiceException(String.format("请联系%s销售进行购买商品！",fsuser.getCompanyUserName()));
-            }else {
-                fsuser.setCompanyUserId(param.getCompanyUserId());
-                userService.updateFsUser(fsuser);
-            }
-
-
             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);