zyp

fs-service/src/main/java/com/fs/course/param/FsCourseSendRewardUParam.java

@@ -27,4 +27,6 @@ public class FsCourseSendRewardUParam implements Serializable
     private Integer sendType;
     private Long periodId;
 
+    private String appId;
+
 }

fs-service/src/main/java/com/fs/course/param/newfs/FsUserCourseAddCompanyUserParam.java

@@ -33,7 +33,7 @@ public class FsUserCourseAddCompanyUserParam implements Serializable {
     @ApiModelProperty(value = "营期id")
     private Long periodId;
 
-    @NotNull(message = "项目id不能为空")
+//    @NotNull(message = "项目id不能为空")
     @ApiModelProperty(value = "项目ID")
     private Long projectId;
 

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -1421,7 +1421,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         }
 
         // 逻辑调整：如果会员已经绑定了销售，直接提示，不添加重粉数据了-2025年6月16日14点53分
-        if (fsUser.getCompanyUserId() != null && !param.getCompanyUserId().equals(fsUser.getCompanyUserId())){
+        if (!param.getCompanyUserId().equals(fsUser.getCompanyUserId())){
             return ResponseResult.fail(406,"该用户已成为其他销售会员");
         }
 

fs-user-course/src/main/java/com/fs/course/controller/UserController.java

@@ -40,6 +40,7 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import static com.fs.common.utils.SecurityUtils.getUserId;
 import static com.fs.his.utils.PhoneUtil.decryptPhoneMk;
@@ -62,6 +63,21 @@ public class UserController extends  AppBaseController {
     @Autowired
     private IQwAppContactWayService qwAppContactWayService;
 
+
+    @PostMapping("/loginTest")
+    public R loginTest(@RequestBody String userId) {
+        FsUser user = userService.selectFsUserByUserId(Long.parseLong(userId));
+        if (user!=null){
+            String token = jwtUtils.generateToken(user.getUserId());
+            redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
+            Map<String, Object> map = new HashMap<>();
+            map.put("token", token);
+            map.put("user", user);
+            return R.ok(map);
+        }
+        return R.error("用户不存在！");
+    }
+
     /**
      * 获取用户信息
      * @param request

fs-user-course/src/main/java/com/fs/course/controller/WxCompanyUserController.java

@@ -125,6 +125,10 @@ public class WxCompanyUserController extends AppBaseController {
             // 2. 获取销售信息
             CompanyUser companyUser = getCompanyUser(param);
 
+            if (user!=null && user.getCompanyUserId() != null && !param.getCompanyUserId().equals(user.getCompanyUserId())) {
+                return R.error("该用户已成为其他销售会员");
+            }
+
             // 3. 处理用户注册或更新
             String ip = IpUtil.getRequestIp();
             user = handleUserRegisterOrUpdate(user, param, session, phoneNoInfo, company, companyUser, ip);
@@ -182,6 +186,8 @@ public class WxCompanyUserController extends AppBaseController {
             return createUser(param, session, phoneNoInfo, company, companyUser);
 //            }
         } else {
+            // 逻辑调整：如果会员已经绑定了销售，直接提示，不让注册-2025年6月16日14点53分
+
             // 已存在用户，更新信息
             return updateUser(user, param, session, phoneNoInfo, company, companyUser);
 //            return user;
@@ -224,10 +230,7 @@ public class WxCompanyUserController extends AppBaseController {
         if (param.getAuthType() == 1 && phoneNoInfo != null) {
             userMap.setPhone(phoneNoInfo.getPhoneNumber());
         }
-        // 逻辑调整：如果会员已经绑定了销售，直接提示，不让注册-2025年6月16日14点53分
-        if (user.getCompanyUserId() != null && !param.getCompanyUserId().equals(user.getCompanyUserId())) {
-            throw new RuntimeException("该用户已成为其他销售会员");
-        }
+
         if (companyUser != null && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1) {
             userMap.setCompanyId(param.getCompanyId());
             userMap.setCompanyUserId(param.getCompanyUserId());