feat：h5生成短链参数增加项目、是否添加客服接口返回内容调整

fs-qw-task/src/main/java/com/fs/app/controller/CommonController.java

@@ -11,6 +11,7 @@ import com.fs.common.core.domain.ResponseResult;
 import com.fs.course.mapper.FsCourseWatchLogMapper;
 import com.fs.course.param.newfs.FsUserCourseAddCompanyUserParam;
 import com.fs.course.service.*;
+import com.fs.his.domain.FsUser;
 import com.fs.his.service.IFsInquiryOrderService;
 import com.fs.qw.mapper.QwExternalContactMapper;
 import com.fs.qw.service.IQwExternalContactService;
@@ -261,7 +262,7 @@ public class CommonController {
         return "s";
     }
     @GetMapping("/isAddkf")
-    public ResponseResult<Boolean> isAddkf(FsUserCourseAddCompanyUserParam param) throws Exception {
+    public ResponseResult<FsUser> isAddkf(FsUserCourseAddCompanyUserParam param) throws Exception {
         return courseVideoService.isAddCompanyUser(param);
     }
 

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

@@ -38,4 +38,6 @@ public class FsCourseLinkCreateParam {
     @ApiModelProperty(value = "营期课程id")
     private Long id;
 
+    private Long projectId;//项目ID
+
 }

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

@@ -38,4 +38,7 @@ public class FsCourseSortLinkParam {
     @ApiModelProperty(value = "营期课程id")
     private Long id;
 
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+
 }

fs-service/src/main/java/com/fs/course/service/IFsUserCourseVideoService.java

@@ -16,6 +16,7 @@ import com.fs.course.vo.newfs.FsUserCourseVideoDetailsVO;
 import com.fs.course.vo.newfs.FsUserCourseVideoLinkDetailsVO;
 import com.fs.course.vo.newfs.FsUserCourseVideoPageListVO;
 import com.fs.course.vo.newfs.FsUserVideoListVO;
+import com.fs.his.domain.FsUser;
 import com.fs.his.vo.OptionsVO;
 
 import java.util.List;
@@ -127,7 +128,7 @@ public interface IFsUserCourseVideoService
      * @param param 入参
      * @return 是/否 成功
      */
-    ResponseResult<Boolean> isAddCompanyUser(FsUserCourseAddCompanyUserParam param);
+    ResponseResult<FsUser> isAddCompanyUser(FsUserCourseAddCompanyUserParam param);
 
     /**
      * 获取链接用户课程详情

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

@@ -564,6 +564,7 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
 
         FsCourseRealLink courseMap = new FsCourseRealLink();
         BeanUtils.copyProperties(link, courseMap);
+        courseMap.setProjectId(param.getProjectId());
         String courseJson = JSON.toJSONString(courseMap);
         link.setRealLink(realLink + courseJson);
 

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

@@ -1503,7 +1503,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
     @Override
     @Transactional
-    public ResponseResult<Boolean> isAddCompanyUser(FsUserCourseAddCompanyUserParam param) {
+    public ResponseResult<FsUser> isAddCompanyUser(FsUserCourseAddCompanyUserParam param) {
         logger.info("\n 【进入个微-判断是否添加客服】，入参：{}",param);
         //查询用户
         FsUser fsUser = fsUserMapper.selectFsUserById(param.getUserId());
@@ -1531,7 +1531,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
                 // 设置 Redis 记录的过期时间（例如 5 分钟）
                 redisCache.expire(redisKey, 300, TimeUnit.SECONDS);
             }
-            return ResponseResult.ok(Boolean.TRUE);
+            return ResponseResult.ok(fsUser);
         }
         //判断该销售是否存在
         CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getCompanyUserId());
@@ -1637,7 +1637,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 //            fsUserCourseBeMemberParam.setCompanyUserId(param.getCompanyUserId());
 //            fsUserService.setRepeatFansTag(fsUserCourseBeMemberParam);
 //        }
-        return ResponseResult.ok(Boolean.TRUE);
+        return ResponseResult.ok(fsUser);
     }
     /**
      * 检查用户课程时间段是否有效

fs-service/src/main/resources/application-config-druid-fby.yml

@@ -76,8 +76,8 @@ watch:
   password3: v9xsKuqn_$d2y
 
 fs :
-  commonApi: http://192.168.0.238:8010
-  h5CommonApi: http://192.168.0.238:8010
+  commonApi: http://192.168.0.95:8010
+  h5CommonApi: http://192.168.0.95:8010
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16

fs-user-app/src/main/java/com/fs/app/controller/course/CourseFsUserController.java

@@ -17,6 +17,7 @@ import com.fs.course.param.newfs.FsUserCourseVideoUParam;
 import com.fs.course.service.*;
 import com.fs.course.vo.FsUserCourseVideoH5VO;
 import com.fs.course.vo.newfs.FsUserCourseVideoLinkDetailsVO;
+import com.fs.his.domain.FsUser;
 import com.fs.his.enums.FsUserOperationEnum;
 import com.fs.his.service.IFsUserService;
 import com.fs.system.service.ISysConfigService;
@@ -53,7 +54,7 @@ public class CourseFsUserController extends AppBaseController {
     @Login
     @ApiOperation("判断是否添加客服（是否关联销售）")
     @PostMapping("/isAddKf")
-    public ResponseResult<Boolean> isAddCompanyUser(@Valid @RequestBody FsUserCourseAddCompanyUserParam param) {
+    public ResponseResult<FsUser> isAddCompanyUser(@Valid @RequestBody FsUserCourseAddCompanyUserParam param) {
         Long userId = Long.parseLong(getUserId());
         param.setUserId(userId);
         return courseVideoService.isAddCompanyUser(param);

fs-user-app/src/main/java/com/fs/app/controller/store/CourseWxH5ScrmController.java

@@ -15,6 +15,7 @@ import com.fs.course.param.newfs.FsUserCourseVideoUParam;
 import com.fs.course.service.*;
 import com.fs.course.vo.FsUserCourseVideoH5VO;
 import com.fs.course.vo.newfs.FsUserCourseVideoLinkDetailsVO;
+import com.fs.his.domain.FsUser;
 import com.fs.hisStore.service.IFsUserScrmService;
 import com.fs.system.service.ISysConfigService;
 import io.swagger.annotations.Api;
@@ -57,7 +58,7 @@ public class CourseWxH5ScrmController extends AppBaseController {
     @Login
     @ApiOperation("判断是否添加客服（是否关联销售）")
     @PostMapping("/isAddKf")
-    public ResponseResult<Boolean> isAddCompanyUser(@Valid @RequestBody FsUserCourseAddCompanyUserParam param) {
+    public ResponseResult<FsUser> isAddCompanyUser(@Valid @RequestBody FsUserCourseAddCompanyUserParam param) {
         Long userId = Long.parseLong(getUserId());
         param.setUserId(userId);
         return courseVideoService.isAddCompanyUser(param);