Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

fs-company-app/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -1,6 +1,7 @@
 package com.fs.app.controller;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fs.app.annotation.Login;
 import com.fs.app.config.ImageStorageConfig;
@@ -11,6 +12,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyUserService;
+import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.FsUserCoursePeriod;
 import com.fs.course.dto.BatchSendCourseDTO;
 import com.fs.course.dto.BatchUrgeCourseDTO;
@@ -32,6 +34,7 @@ import com.fs.im.service.IFsImMsgSendDetailService;
 import com.fs.im.service.IFsImMsgSendLogService;
 import com.fs.im.service.OpenIMService;
 import com.fs.im.vo.FsImMsgSendLogVO;
+import com.fs.system.service.ISysConfigService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -83,6 +86,11 @@ public class FsUserCourseVideoController extends AppBaseController {
     @Autowired
     private IFsImMsgSendLogService imMsgSendLogService;
 
+    @Autowired
+    private ISysConfigService configService;
+
+    private final String FANG_HUA_APP_ID = "wx503cf8ab31f83dd4";
+
     @Login
     @GetMapping("/pageList")
     @ApiOperation("课程分页列表")
@@ -377,4 +385,24 @@ public class FsUserCourseVideoController extends AppBaseController {
         return imMsgSendLogService.deleteFsImMsgSendLogAndDetail(logId);
     }
 
+
+
+    @ApiOperation("获取登录小程id值")
+    @GetMapping("/getLoginMiniAppId/{appId}")
+    public ResponseResult getLoginMiniAppId(@PathVariable String appId){
+        String json = configService.selectConfigByKey("course.config");
+        if(null == json || com.hc.openapi.tool.util.StringUtils.isBlank(json)){
+            ResponseResult.fail(500,"请先配置课程系统参数");
+        }
+        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+        //判断配置的appid是否为芳华惠选appid 如果配置了直接返回芳华惠选的appid
+        if(null != config && StringUtils.isNotBlank(config.getLoginMiniAppId())){
+            String loginMiniAppId = config.getLoginMiniAppId();
+            if(FANG_HUA_APP_ID.equals(loginMiniAppId)){
+                return ResponseResult.ok(FANG_HUA_APP_ID);
+            }
+        }
+
+        return ResponseResult.ok(appId);
+    }
 }

fs-service/src/main/java/com/fs/course/config/CourseConfig.java

@@ -46,6 +46,11 @@ public class CourseConfig implements Serializable {
      */
     private boolean sidebarOnlyShowTodayCourse;
 
+    /**
+     * 用于配置登录的小程序id
+     */
+    private String loginMiniAppId;
+
     /**
      * 小程序授权头像昵称方式（目前仅会员看课有效）
      * 1：小程序原生授权 2：跳转H5服务号授权

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

@@ -563,12 +563,12 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         FsCourseLink courseLink = courseLinkMapper.selectFsCourseLinkByLink(param.getLink());
         String msg = "<div style=\"color: red;margin-bottom: 15px;font-weight: bold;\">本课程为群会员独享<br>请长按二维码</div>\n" +
                 "\t\t\t\t\t<div style=\"color: #999;font-size: 14px;font-weight: bold;\">添加伴学助手免费领取会员权限</div>";
-        QwGroupChat qwGroupChat = qwGroupChatMapper.selectQwGroupChatByChatId(courseLink.getChatId());
+        QwGroupChat qwGroupChat = qwGroupChatMapper.selectQwGroupChatByChatId(param.getChatId());
         if(qwGroupChat == null){
             return R.error("群参数异常");
         }
         SopUserLogsInfo sopUserLogsInfo =  new SopUserLogsInfo();
-        sopUserLogsInfo.setChatId(courseLink.getChatId());
+        sopUserLogsInfo.setChatId(param.getChatId());
         List<QwGroupChatUser> qwGroupChatUsers = qwGroupChatUserMapper.selectByChatId(sopUserLogsInfo);
         if(qwGroupChatUsers == null || qwGroupChatUsers.isEmpty()){
             return R.error("群参数异常");
@@ -583,7 +583,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             return addCustomerService(param.getQwUserId(),msg);
         }
         if(qwGroupChatUsers.stream().noneMatch(e -> e.getUserId().equals(qwExternalContact.getExternalUserId()))){
-            log.error("客户不在群：{}，里面：{}", qwGroupChat.getChatId(), qwExternalContact.getExternalUserId());
+            log.error("客户不在群：{}，里面：{}", param.getChatId(), qwExternalContact.getExternalUserId());
             return addCustomerService(param.getQwUserId(),msg);
         }
         Long qwExternalId = qwExternalContact.getId();