zyp

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -889,7 +889,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
                             createParam.setCompanyUserId(Long.parseLong(companyUserId));
                             createParam.setCompanyId(Long.parseLong(companyId));
                             createParam.setChatId(logVo.getChatId());
-                            createParam.setQwUserId(qwUserId);
+                            createParam.setQwUserId(Long.parseLong(qwUserId));
                             createParam.setDays(setting.getExpiresDays());
                             R createLink = courseLinkService.createRoomLinkUrl(createParam);
                             if (createLink.get("code").equals(500)) {
@@ -1016,7 +1016,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         // 手动创建 FsCourseLink 对象，避免使用 BeanUtils.copyProperties
         FsCourseLink link = new FsCourseLink();
         link.setCompanyId(Long.parseLong(companyId));
-        link.setQwUserId(qwUserId);
+        link.setQwUserId(Long.parseLong(qwUserId));
         link.setCompanyUserId(Long.parseLong(companyUserId));
         link.setVideoId(videoId.longValue());
         link.setCorpId(logVo.getCorpId());
@@ -1174,7 +1174,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         // 手动创建 FsCourseLink 对象，避免使用 BeanUtils.copyProperties
         FsCourseLink link = new FsCourseLink();
         link.setCompanyId(Long.parseLong(companyId));
-        link.setQwUserId(qwUserId);
+        link.setQwUserId(Long.parseLong(qwUserId));
         link.setCompanyUserId(Long.parseLong(companyUserId));
         link.setVideoId(videoId.longValue());
         link.setCorpId(corpId);
@@ -1230,7 +1230,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         // 手动创建 FsCourseLink 对象，避免使用 BeanUtils.copyProperties
         FsCourseLink link = new FsCourseLink();
         link.setCompanyId(Long.parseLong(companyId));
-        link.setQwUserId(qwUserId);
+        link.setQwUserId(Long.parseLong(qwUserId));
         link.setCompanyUserId(Long.parseLong(companyUserId));
         link.setVideoId(videoId.longValue());
         link.setCorpId(logVo.getCorpId());
@@ -1293,7 +1293,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         watchLog.setVideoId(videoId != null ? videoId.longValue() : null);
         watchLog.setQwExternalContactId(externalId != null ? Long.valueOf(externalId) : null);
         watchLog.setSendType(2);
-        watchLog.setQwUserId(qwUserId);
+        watchLog.setQwUserId(Long.parseLong(qwUserId));
         watchLog.setSopId(sopLogs.getSopId());
         watchLog.setDuration(0L);
         watchLog.setCourseId(courseId != null ? courseId.longValue() : null);

fs-qwhook-sop/src/main/java/com/fs/app/controller/ApisFsUserCourseVideoController.java

@@ -179,7 +179,7 @@ public class ApisFsUserCourseVideoController extends BaseController {
         createParam.setCorpId(param.getCorpId());
         createParam.setCompanyUserId(qwUser.getCompanyUserId());
         createParam.setCompanyId(qwUser.getCompanyId());
-        createParam.setQwUserId(qwUser.getId().toString());
+        createParam.setQwUserId(qwUser.getId());
         String linkUrl;
         R createLink = courseLinkService.createRoomLinkUrl(createParam);
         if (createLink.get("code").equals(500)){

fs-qwhook-sop/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -151,7 +151,7 @@ public class FsUserCourseVideoController {
         createParam.setCorpId(param.getCorpId());
         createParam.setCompanyUserId(qwUser.getCompanyUserId());
         createParam.setCompanyId(qwUser.getCompanyId());
-        createParam.setQwUserId(qwUser.getId().toString());
+        createParam.setQwUserId(qwUser.getId());
         String linkUrl;
         R createLink = courseLinkService.createRoomLinkUrl(createParam);
         if (createLink.get("code").equals(500)){

fs-qwhook/src/main/java/com/fs/app/controller/ApisFsUserCourseVideoController.java

@@ -180,7 +180,7 @@ public class ApisFsUserCourseVideoController extends BaseController {
         createParam.setCorpId(param.getCorpId());
         createParam.setCompanyUserId(qwUser.getCompanyUserId());
         createParam.setCompanyId(qwUser.getCompanyId());
-        createParam.setQwUserId(qwUser.getId().toString());
+        createParam.setQwUserId(qwUser.getId());
         String linkUrl;
         R createLink = courseLinkService.createRoomLinkUrl(createParam);
         if (createLink.get("code").equals(500)){

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

@@ -146,7 +146,7 @@ public class FsUserCourseVideoController {
         createParam.setCorpId(param.getCorpId());
         createParam.setCompanyUserId(qwUser.getCompanyUserId());
         createParam.setCompanyId(qwUser.getCompanyId());
-        createParam.setQwUserId(qwUser.getId().toString());
+        createParam.setQwUserId(qwUser.getId());
         String linkUrl;
         R createLink = courseLinkService.createRoomLinkUrl(createParam);
         if (createLink.get("code").equals(500)){

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

@@ -35,4 +35,9 @@ public class CourseMaConfig {
      */
     private String msgDataFormat;
 
+    /**
+     * 类型 1小程序 2公众号
+     */
+    private String type;
+
 }

fs-service/src/main/java/com/fs/course/domain/FsCourseLink.java

@@ -36,7 +36,7 @@ public class FsCourseLink extends BaseEntity
 
     /** 企微userId */
     @Excel(name = "企微userId")
-    private String qwUserId;
+    private Long qwUserId;
 
     /** 课节id */
     @Excel(name = "课节id")

fs-service/src/main/java/com/fs/course/domain/FsCourseRealLink.java

@@ -15,7 +15,7 @@ public class FsCourseRealLink implements Serializable
 
     private Long companyUserId;
 
-    private String qwUserId;
+    private Long qwUserId;
 
 
     private Long videoId;

fs-service/src/main/java/com/fs/course/domain/FsCourseWatchLog.java

@@ -49,7 +49,7 @@ public class FsCourseWatchLog extends BaseEntity
 
     /** 分享人企微userId */
     @Excel(name = "分享人企微userId")
-    private String qwUserId;
+    private Long qwUserId;
 
     /** 销售id */
     @Excel(name = "销售id")

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

@@ -12,8 +12,8 @@ public class FsCourseLinkCreateParam {
 
     private Integer days;
 
-    private Long qwUserIdLong;
-    private String qwUserId;
+//    private Long qwUserIdLong;
+    private Long qwUserId;
 
     private String corpId;
 

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

@@ -203,15 +203,13 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
 
     @Override
     public R createRoomLinkUrl(FsCourseLinkCreateParam param) {
-        QwUser qwUser;
-        if(param.getQwUserIdLong() != null){
-            qwUser = qwUserMapper.selectById(param.getQwUserIdLong());
-        }else{
-            qwUser = qwUserMapper.selectOne(new QueryWrapper<QwUser>().eq("qw_user_id", param.getQwUserId()).eq("corp_id", param.getCorpId()));
-        }
-        if(qwUser == null){
-            return R.error("未找到企微账号");
-        }
+//        QwUser qwUser;
+//        if(param.getQwUserId() != null){
+//            qwUser = qwUserMapper.selectById(param.getQwUserIdLong());
+//        }
+//        if(qwUser == null){
+//            return R.error("未找到企微账号");
+//        }
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
         FsCourseLink link = new FsCourseLink();
@@ -313,7 +311,7 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
     }
 
 
-    public FsCourseLink createFsCourseLink(String corpId, Date sendTime,Long courseId,Long videoId, String qwUserId,
+    public FsCourseLink createFsCourseLink(String corpId, Date sendTime,Long courseId,Long videoId, Long qwUserId,
                                            Long companyUserId, Long companyId,Long externalId,Integer type){
         // 手动创建 FsCourseLink 对象，避免使用 BeanUtils.copyProperties
         FsCourseLink link = new FsCourseLink();

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

@@ -509,7 +509,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
     @Override
     public void testFinishMsg() {
         FsCourseWatchLog finishLog = fsCourseWatchLogMapper.selectFsCourseWatchLogByLogId(341170L);
-        QwUser qwUser = qwUserMapper.selectQwUserById(Long.parseLong(finishLog.getQwUserId()));
+        QwUser qwUser = qwUserMapper.selectQwUserById(finishLog.getQwUserId());
         QwExternalContact externalContact = qwExternalContactMapper.selectQwExternalContactById(finishLog.getQwExternalContactId());
         FsCourseFinishTemp finishTemp = fsCourseFinishTempMapper.selectFsCourseFinishTempByCompanyUserId(finishLog.getCompanyUserId(),finishLog.getVideoId());
         QwSopCourseFinishTempSetting setting = new QwSopCourseFinishTempSetting();
@@ -620,7 +620,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
 
             FsCourseWatchLog watchLog = new FsCourseWatchLog();
             watchLog.setVideoId(videoId);
-            watchLog.setQwUserId(qwUserId.toString());
+            watchLog.setQwUserId(qwUserId);
             watchLog.setQwExternalContactId(externalId);
             watchLog.setDuration(duration);
 
@@ -688,7 +688,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
             Duration duration = Duration.between(lastHeartbeatTime, now);
 
             watchLog.setVideoId(videoId);
-            watchLog.setQwUserId(qwUserId.toString());
+            watchLog.setQwUserId(qwUserId);
             watchLog.setQwExternalContactId(externalId);
             // 如果超过一分钟没有心跳，标记为“观看中断”
             if (duration.getSeconds() >= 60) {

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

@@ -861,7 +861,12 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
         // 准备发送红包参数
         WxSendRedPacketParam packetParam = new WxSendRedPacketParam();
-        packetParam.setOpenId(getOpenId(user.getUserId(), param.getCompanyId(), param.getSource()));
+//        packetParam.setOpenId(getOpenId(user.getUserId(), param.getCompanyId(), param.getSource()));
+        packetParam.setOpenId(user.getMpOpenId());
+        // 来源是小程序切换openId
+        if (param.getSource() == 2) {
+            packetParam.setOpenId(user.getCourseMaOpenId());
+        }
         packetParam.setAmount(amount);
         packetParam.setSource(param.getSource());
         packetParam.setRedPacketMode(config.getRedPacketMode());
@@ -1385,7 +1390,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             watchLog.setVideoId(videoId);
             watchLog.setQwExternalContactId(externalId);
             watchLog.setSendType(2);
-            watchLog.setQwUserId(String.valueOf(qwUser.getId()));
+            watchLog.setQwUserId(qwUser.getId());
             watchLog.setDuration(0L);
             watchLog.setCourseId(courseId);
             watchLog.setCompanyUserId(qwUser.getCompanyUserId());
@@ -1414,7 +1419,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
         FsCourseLink link = new FsCourseLink();
         link.setCompanyId(qwUser.getCompanyId());
-        link.setQwUserId(String.valueOf(qwUser.getId()));
+        link.setQwUserId(qwUser.getId());
         link.setCompanyUserId(qwUser.getCompanyUserId());
         link.setVideoId(videoId);
         link.setCorpId(qwUser.getCorpId());

fs-service/src/main/java/com/fs/fastGpt/service/impl/AiHookServiceImpl.java

@@ -772,7 +772,7 @@ public class AiHookServiceImpl implements AiHookService {
             if (fsCourseWatchLogVO!=null){
                 FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                 param.setVideoId(fsCourseWatchLogVO.getVideoId());
-                param.setQwUserId(String.valueOf(user.getId()));
+                param.setQwUserId(user.getId());
                 param.setDays(1);
                 param.setCorpId(user.getCorpId());
                 param.setCourseId(fsCourseWatchLogVO.getCourseId());
@@ -803,7 +803,7 @@ public class AiHookServiceImpl implements AiHookService {
                     if (fsUserCourseVideo==null){
                         FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                         param.setVideoId(fsUserCourseVideo.getVideoId());
-                        param.setQwUserId(String.valueOf(user.getId()));
+                        param.setQwUserId(user.getId());
                         param.setDays(1);
                         param.setCorpId(user.getCorpId());
                         param.setCourseId(fsUserCourseVideo.getCourseId());
@@ -1282,7 +1282,7 @@ public class AiHookServiceImpl implements AiHookService {
             if (fsCourseWatchLogVO!=null){
                 FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                 param.setVideoId(fsCourseWatchLogVO.getVideoId());
-                param.setQwUserId(String.valueOf(user.getId()));
+                param.setQwUserId(user.getId());
                 param.setDays(1);
                 param.setCorpId(user.getCorpId());
                 param.setCourseId(fsCourseWatchLogVO.getCourseId());
@@ -1313,7 +1313,7 @@ public class AiHookServiceImpl implements AiHookService {
                     System.out.println("课程："+fsUserCourseVideo);
                     FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                     param.setVideoId(fsUserCourseVideo.getVideoId());
-                    param.setQwUserId(String.valueOf(user.getId()));
+                    param.setQwUserId(user.getId());
                     param.setDays(1);
                     param.setCorpId(user.getCorpId());
                     param.setCourseId(fsUserCourseVideo.getCourseId());

fs-service/src/main/java/com/fs/fastGpt/service/impl/AiNewServiceImpl.java

@@ -534,7 +534,7 @@ public class AiNewServiceImpl implements AiNewService {
             if (fsCourseWatchLogVO!=null){
                 FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                 param.setVideoId(fsCourseWatchLogVO.getVideoId());
-                param.setQwUserId(String.valueOf(user.getId()));
+                param.setQwUserId(user.getId());
                 param.setDays(1);
                 param.setCorpId(user.getCorpId());
                 param.setCourseId(fsCourseWatchLogVO.getCourseId());
@@ -565,7 +565,7 @@ public class AiNewServiceImpl implements AiNewService {
                     if (fsUserCourseVideo==null){
                         FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                         param.setVideoId(fsUserCourseVideo.getVideoId());
-                        param.setQwUserId(String.valueOf(user.getId()));
+                        param.setQwUserId(user.getId());
                         param.setDays(1);
                         param.setCorpId(user.getCorpId());
                         param.setCourseId(fsUserCourseVideo.getCourseId());
@@ -1052,7 +1052,7 @@ public class AiNewServiceImpl implements AiNewService {
             if (fsCourseWatchLogVO!=null){
                 FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                 param.setVideoId(fsCourseWatchLogVO.getVideoId());
-                param.setQwUserId(String.valueOf(user.getId()));
+                param.setQwUserId(user.getId());
                 param.setDays(1);
                 param.setCorpId(user.getCorpId());
                 param.setCourseId(fsCourseWatchLogVO.getCourseId());
@@ -1083,7 +1083,7 @@ public class AiNewServiceImpl implements AiNewService {
                     System.out.println("课程："+fsUserCourseVideo);
                     FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                     param.setVideoId(fsUserCourseVideo.getVideoId());
-                    param.setQwUserId(String.valueOf(user.getId()));
+                    param.setQwUserId(user.getId());
                     param.setDays(1);
                     param.setCorpId(user.getCorpId());
                     param.setCourseId(fsUserCourseVideo.getCourseId());

fs-service/src/main/java/com/fs/fastGpt/service/impl/AiServiceImpl.java

@@ -511,7 +511,7 @@ public class AiServiceImpl implements AiService {
             if (fsCourseWatchLogVO!=null){
                 FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                 param.setVideoId(fsCourseWatchLogVO.getVideoId());
-                param.setQwUserId(String.valueOf(user.getId()));
+                param.setQwUserId(user.getId());
                 param.setDays(1);
                 param.setCorpId(user.getCorpId());
                 param.setCourseId(fsCourseWatchLogVO.getCourseId());
@@ -542,7 +542,7 @@ public class AiServiceImpl implements AiService {
                     if (fsUserCourseVideo==null){
                         FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                         param.setVideoId(fsUserCourseVideo.getVideoId());
-                        param.setQwUserId(String.valueOf(user.getId()));
+                        param.setQwUserId(user.getId());
                         param.setDays(1);
                         param.setCorpId(user.getCorpId());
                         param.setCourseId(fsUserCourseVideo.getCourseId());
@@ -1029,7 +1029,7 @@ public class AiServiceImpl implements AiService {
             if (fsCourseWatchLogVO!=null){
                 FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                 param.setVideoId(fsCourseWatchLogVO.getVideoId());
-                param.setQwUserId(String.valueOf(user.getId()));
+                param.setQwUserId(user.getId());
                 param.setDays(1);
                 param.setCorpId(user.getCorpId());
                 param.setCourseId(fsCourseWatchLogVO.getCourseId());
@@ -1060,7 +1060,7 @@ public class AiServiceImpl implements AiService {
                     System.out.println("课程："+fsUserCourseVideo);
                     FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                     param.setVideoId(fsUserCourseVideo.getVideoId());
-                    param.setQwUserId(String.valueOf(user.getId()));
+                    param.setQwUserId(user.getId());
                     param.setDays(1);
                     param.setCorpId(user.getCorpId());
                     param.setCourseId(fsUserCourseVideo.getCourseId());

fs-service/src/main/java/com/fs/his/service/impl/FsIntegralGoodsServiceImpl.java

@@ -191,7 +191,7 @@ public class FsIntegralGoodsServiceImpl implements IFsIntegralGoodsService
         List<FsIntegralGoods> stageGoods = selectRandomStageGoods(param);
 
         if (stageGoods.size()<3){
-            param.setMinPoints(currentStage);
+            param.setMinPoints(stageMaxPoints-5000);
             param.setMaxPoints(stageMaxPoints);
             stageGoods = selectRandomStageGoods(param);
         }

fs-service/src/main/java/com/fs/qw/service/impl/QwContactWayServiceImpl.java

@@ -445,7 +445,7 @@ public class QwContactWayServiceImpl implements IQwContactWayService
                 try {
                     FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                     param.setVideoId(Long.valueOf(att.getLink().getVideoId()));
-                    param.setQwUserId(String.valueOf(qwUser.getId()));
+                    param.setQwUserId(qwUser.getId());
                     param.setDays(att.getLink().getExpiresDays());
                     param.setCorpId(corpId);
                     param.setCourseId(Long.valueOf(att.getLink().getCourseId()));
@@ -485,7 +485,7 @@ public class QwContactWayServiceImpl implements IQwContactWayService
         watchLog.setVideoId(videoId != null ? videoId.longValue() : null);
         watchLog.setQwExternalContactId(externalId != null ? Long.valueOf(externalId) : null);
         watchLog.setSendType(2);
-        watchLog.setQwUserId(qwUserId);
+        watchLog.setQwUserId(Long.valueOf(qwUserId));
         watchLog.setSopId(null);
         watchLog.setCourseId(courseId != null ? courseId.longValue() : null);
         watchLog.setCompanyUserId(companyUserId != null ? Long.valueOf(companyUserId) : null);

fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -3127,7 +3127,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                 try {
                     FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                     param.setVideoId(Long.valueOf(att.getLink().getVideoId()));
-                    param.setQwUserId(String.valueOf(qwUser.getId()));
+                    param.setQwUserId(qwUser.getId());
                     param.setDays(att.getLink().getExpiresDays());
                     param.setCorpId(corpId);
                     param.setCourseId(Long.valueOf(att.getLink().getCourseId()));
@@ -3166,7 +3166,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
 
                         FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                         param.setVideoId(Long.valueOf(att.getMiniprogram().getVideoId()));
-                        param.setQwUserId(String.valueOf(qwUser.getId()));
+                        param.setQwUserId(qwUser.getId());
                         param.setDays(att.getMiniprogram().getExpiresDays());
                         param.setCorpId(corpId);
                         param.setCourseId(Long.valueOf(att.getMiniprogram().getCourseId()));
@@ -3224,7 +3224,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
         watchLog.setVideoId(videoId != null ? videoId.longValue() : null);
         watchLog.setQwExternalContactId(externalId != null ? Long.valueOf(externalId) : null);
         watchLog.setSendType(2);
-        watchLog.setQwUserId(qwUserId);
+        watchLog.setQwUserId(Long.valueOf(qwUserId));
         watchLog.setSopId(null);
         watchLog.setCourseId(courseId != null ? courseId.longValue() : null);
         watchLog.setCompanyUserId(companyUserId != null ? Long.valueOf(companyUserId) : null);

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -543,7 +543,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                                     createParam.setCompanyUserId(Long.parseLong(companyUserId));
                                     createParam.setCompanyId(Long.parseLong(companyId));
                                     createParam.setChatId(groupUser.getChatId());
-                                    createParam.setQwUserId(qwUser.getQwUserId());
+                                    createParam.setQwUserId(Long.parseLong(qwUser.getQwUserId()));
                                     createParam.setDays(st.getExpiresDays());
                                     R createLink = courseLinkService.createRoomLinkUrl(createParam);
                                     if (createLink.get("code").equals(500)) {
@@ -639,7 +639,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                                     createParam.setCompanyUserId(qwUser.getCompanyUserId());
                                     createParam.setCompanyId(qwUser.getCompanyId());
                                     createParam.setChatId(groupChat.getChatId());
-                                    createParam.setQwUserId(qwUser.getQwUserId());
+                                    createParam.setQwUserId(Long.parseLong(qwUser.getQwUserId()));
                                     createParam.setDays(st.getExpiresDays());
                                     R createLink = courseLinkService.createRoomLinkUrl(createParam);
                                     if (createLink.get("code").equals(500)) {
@@ -1197,7 +1197,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
             watchLog.setVideoId(videoId != null ? videoId.longValue() : null);
             watchLog.setQwExternalContactId(externalId);
             watchLog.setSendType(2);
-            watchLog.setQwUserId(qwUserId);
+            watchLog.setQwUserId(Long.parseLong(qwUserId));
             watchLog.setSopId(sopId);
             watchLog.setDuration(0L);
             watchLog.setCourseId(courseId != null ? courseId.longValue() : null);
@@ -1336,7 +1336,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
         // 手动创建 FsCourseLink 对象，避免使用 BeanUtils.copyProperties
         FsCourseLink link = new FsCourseLink();
         link.setCompanyId(Long.parseLong(companyId));
-        link.setQwUserId(qwUserId);
+        link.setQwUserId(Long.parseLong(qwUserId));
         link.setCompanyUserId(Long.parseLong(companyUserId));
         link.setVideoId(videoId.longValue());
         link.setCorpId(corpId);

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsServiceImpl.java

@@ -550,7 +550,7 @@ public class SopUserLogsServiceImpl  implements ISopUserLogsService {
                         if (item.getIsBindUrl() != null && item.getIsBindUrl().equals("1")) {
                             FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
                             param.setVideoId((long) videoId);
-                            param.setQwUserId(String.valueOf(qwUserId));
+                            param.setQwUserId(Long.valueOf(qwUserId));
 //                            param.setDays(item.getExpiresDays());
                             param.setCorpId(log.getCorpId());
                             param.setCourseId(Long.valueOf(courseId));
@@ -578,7 +578,7 @@ public class SopUserLogsServiceImpl  implements ISopUserLogsService {
                                 watchLog.setVideoId(Long.valueOf(videoId));
                                 watchLog.setQwExternalContactId(contactId.getExternalId());
                                 watchLog.setSendType(2);
-                                watchLog.setQwUserId(String.valueOf(qwUserId));
+                                watchLog.setQwUserId(Long.parseLong(qwUserId));
                                 watchLog.setCourseId(Long.valueOf(courseId));
                                 watchLog.setCompanyUserId(Long.valueOf(companyUserId));
                                 watchLog.setCompanyId(Long.valueOf(companyId));

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

@@ -10,31 +10,17 @@ logging:
 wx:
   miniapp:
     configs:
-      - appid: wx4115995705bb0ea0   #中康智慧
-        secret: 58910ae743005c396012b029c7def579
-        token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
-        aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
-        msgDataFormat: JSON
-      - appid: wxedde588767b358b1   #中康未来智慧药房
-        secret: 928d2961c81610d8f64b019597212fcd
-        token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
-        aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
-        msgDataFormat: JSON
   cp:
-    corpId: wwb2a1055fb6c9a7c2
+    corpId:
     appConfigs:
-      - agentId: 1000005
-        secret: ec7okROXJqkNafq66-L6aKNv0asTzQIG0CYrj3vyBbo
-        token: PPKOdAlCoMO
-        aesKey: PKvaxtpSv8NGpfTDm7VUHIK8Wok2ESyYX24qpXJAdMP
   pay:
     appId:  #微信公众号或者小程序等的appid
     mchId:  #微信支付商户号
     mchKey:  #微信支付商户密钥
     subAppId:  #服务商模式下的子商户公众账号ID
     subMchId:  #服务商模式下的子商户号
-    keyPath: c:\\cert\\apiclient_cert.p12 # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
-    notifyUrl: https://userapp.his.runtzh.com/app/wxpay/wxPayNotify
+    keyPath:  # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
+    notifyUrl:
   mp:
     useRedis: false
     redisConfig:
@@ -42,8 +28,8 @@ wx:
       port: 6379
       timeout: 2000
     configs:
-      - appId: wx5d3096e20e4bd8ba # 第一个公众号的appid  //公众号名称:成都九州在线互联网医院
-        secret: 1afa05f0c71beff0d52fb849c62e479a # 公众号的appsecret
+      - appId: wxea1da2b708ab3c2f # 第一个公众号的appid  //公众号名称:爱尚佳园
+        secret: 981c60b03292f572039402d7ae09f91f # 公众号的appsecret
         token: PPKOdAlCoMO # 接口配置里的Token值
         aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
 aifabu:  #爱链接

fs-service/src/main/resources/application-druid-zsjk.yml

@@ -43,7 +43,7 @@ spring:
                 master:
                     url: jdbc:mysql://10.206.0.12:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: '@@SOuS98'
+                    password: @@SOuS98
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
@@ -98,7 +98,7 @@ spring:
                 master:
                     url: jdbc:mysql://10.206.0.12:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: '@@SOuS98'
+                    password: @@SOuS98
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量

fs-user-app/src/main/java/com/fs/app/controller/WxUserController.java

@@ -198,24 +198,24 @@ public class WxUserController extends AppBaseController{
         }
         CourseMaConfig courseMaConfig = courseMaConfigs.get(0);
         return handleCourseLogin(param,
-                courseMaConfig.getAppid(),
+                () -> WxMaConfiguration.getMaService(courseMaConfig.getAppid()),
                 courseMaConfig.getName());
     }
 
     /**
      * 公共登录处理方法
      * @param param 登录参数
-     * @param appId appId（差异化点1：不同方式获取WxMaService）
+     * @param wxServiceSupplier 微信服务提供函数（差异化点1：不同方式获取WxMaService）
      * @param logName 日志名称（差异化点2：不同场景标识）
      */
-    private R handleCourseLogin(LoginParam param, String appId, String logName) {
+    private R handleCourseLogin(LoginParam param, Supplier<WxMaService> wxServiceSupplier, String logName) {
         if (StringUtils.isBlank(param.getCode())) {
             return R.error("code不存在");
         }
 
         try {
             // 通过函数式接口获取不同的微信服务实例
-            final WxMaService wxService = WxMaConfiguration.getMaService(appId);
+            final WxMaService wxService = wxServiceSupplier.get();
             WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
             this.logger.info("获取{} Session：{}", logName, session);
 
@@ -243,16 +243,6 @@ public class WxUserController extends AppBaseController{
                 isNewUser = true;
             }
 
-            // 保存用户openId
-//            FsUserWx wx = new FsUserWx();
-//            wx.setFsUserId(user.getUserId());
-//            wx.setAppId(appId);
-//            wx.setOpenId(session.getOpenid());
-//            wx.setUnionId(session.getUnionid());
-//            wx.setCreateTime(LocalDateTime.now());
-//            wx.setUpdateTime(LocalDateTime.now());
-//            userWxService.saveOrUpdate(wx);
-
             // 生成Token
             String token = jwtUtils.generateToken(user.getUserId());
             Map<String,Object> map = new HashMap<>();

fs-user-app/src/main/resources/application.yml

@@ -12,4 +12,4 @@ spring:
 #    active: druid-hdt
 #    active: druid-sxjz
 #    active: druid-yzt
-    active: druid-sft
+    active: druid-myhk