Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

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

@@ -1660,8 +1660,12 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
 
                 // 查询完课模板信息
 //                FsCourseFinishTemp finishTemp = fsCourseFinishTempMapper.selectFsCourseFinishTempByCompanyUserId(finishLog.getCompanyUserId(), finishLog.getVideoId());
+                long startTimeMillis = System.currentTimeMillis();
+                log.info("====== 开始查询模板，{}",finishLog);
                 FsCourseFinishTemp finishTemp = fsCourseFinishTempMapper.selectFsCourseFinishTempByCompanyId(finishLog.getCompanyUserId(),finishLog.getCompanyId(), finishLog.getVideoId());
 
+                long endTimeMillis = System.currentTimeMillis();
+                log.info("====== 模板查询完成，耗时 {} 毫秒 ======", (endTimeMillis - startTimeMillis));
                 // 设置 finishLog 为已发送状态，并加入批量更新列表
                 finishLog.setSendFinishMsg(1);
                 finishLogsToUpdate.add(finishLog);

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

@@ -399,7 +399,6 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
                         domainName = config.getRealLinkDomainName();
                     }
                     String realLink = domainName+courseLink.getRealLink();
-//                    String imgUrl = "https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png";
                     return R.ok().put("realLink",realLink ).put("config",config).put("headerImg",cloudHostProper.getHeaderImg());
                 }
             } else {

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

@@ -343,7 +343,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
         // 从Redis中获取观看时长
         String redisKey = "h5user:watch:duration:" + param.getQwUserId()+ ":" + param.getQwExternalId() + ":" + param.getVideoId();
-        log.info("看课redis-key：{}", redisKey);
+//        log.info("看课redis-key：{}", redisKey);
         try {
             String durationStr = redisCache.getCacheObject(redisKey);
             Long duration = durationStr != null ? Long.parseLong(durationStr) : 0L;
@@ -442,6 +442,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         log.setDuration(0L);
         log.setCreateTime(new Date());
         log.setLogType(3);
+        logger.info("zyp \n【群聊生成看课记录】:{}",param);
         courseWatchLogMapper.insertFsCourseWatchLog(log);
     }
 
@@ -728,17 +729,14 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         if (param.getLinkType() != null && param.getLinkType() == 1) {
             FsCourseRedPacketLog packetLog = redPacketLogMapper.selectFsCourseRedPacketLogByTemporary(param.getVideoId(), param.getUserId());
             if (packetLog != null) {
-                System.out.println("奖励已发放1");
                 return R.error("奖励已发放");
             }
         } else {
             log = courseWatchLogMapper.getWatchCourseVideo(param.getUserId(), param.getVideoId(), param.getQwUserId(), param.getQwExternalId());
             if (log == null) {
-                System.out.println("无记录");
                 return R.error("无记录");
             }
             if (log.getRewardType() != null) {
-                System.out.println("奖励已发放2");
                 return R.error("奖励已发放");
             }
         }
@@ -757,7 +755,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
                 return sendRedPacketReward(param, user, log, video, config);
             // 积分奖励
             case 2:
-                return sendIntegralReward(user, log, config);
+                return sendIntegralReward(param,user, log, config);
             default:
                 return R.error("参数错误！");
         }
@@ -792,7 +790,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
                 return sendRedPacketReward(param, user, log, video, config);
             // 积分奖励
             case 2:
-                return sendIntegralReward(user, log, config);
+                return sendIntegralReward(param,user, log, config);
             default:
                 return R.error("参数错误！");
         }
@@ -891,7 +889,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
      * @param config 配置信息
      * @return 处理结果
      */
-    private R sendIntegralReward(FsUser user, FsCourseWatchLog log, CourseConfig config) {
+    private R sendIntegralReward(FsCourseSendRewardUParam param,FsUser user, FsCourseWatchLog log, CourseConfig config) {
         // 更新用户积分
         FsUser userMap = new FsUser();
         userMap.setUserId(user.getUserId());
@@ -913,6 +911,22 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         courseWatchLogMapper.updateFsCourseWatchLog(log);
         logger.info("发放奖励====================》看课记录,{}",log);
 
+        //转换红包
+        FsCourseRedPacketLog redPacketLog = new FsCourseRedPacketLog();
+        redPacketLog.setCourseId(param.getCourseId());
+        redPacketLog.setOutBatchNo(integralLogs.getId().toString());
+        redPacketLog.setCompanyId(param.getCompanyId());
+        redPacketLog.setUserId(param.getUserId());
+        redPacketLog.setVideoId(param.getVideoId());
+        redPacketLog.setStatus(1);
+        redPacketLog.setQwUserId(param.getQwUserId() != null ? param.getQwUserId() : null );
+        redPacketLog.setCompanyUserId(param.getCompanyUserId());
+        redPacketLog.setCreateTime(new Date());
+        redPacketLog.setAmount(BigDecimal.valueOf(config.getAnswerIntegral()).divide(BigDecimal.valueOf(1000)));
+        redPacketLog.setRemark("点播答题领取积分转");
+        redPacketLog.setWatchLogId(log.getLogId() !=null ? log.getLogId() : null);
+        redPacketLogMapper.insertFsCourseRedPacketLog(redPacketLog);
+
         return R.ok("奖励发放成功");
     }
 

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

@@ -1159,7 +1159,7 @@ public class QwUserServiceImpl implements IQwUserService
             return R.ok("登录成功");
         }
         WxWorkSetCallbackUrlDTO wxWorkSetCallbackUrlDTO = new WxWorkSetCallbackUrlDTO();
-        System.out.println("回调地址"+aiHostProper.getIpadUrl()+"/msg/callback/"+serverId);
+//        System.out.println("回调地址"+aiHostProper.getIpadUrl()+"/msg/callback/"+serverId);
         wxWorkSetCallbackUrlDTO.setUrl(aiHostProper.getIpadUrl()+"/msg/callback/"+serverId);
         wxWorkSetCallbackUrlDTO.setUuid(data.getUuid());
         wxWorkService.SetCallbackUrl(wxWorkSetCallbackUrlDTO,serverId);

fs-service/src/main/resources/application-config-myhk.yml

@@ -47,8 +47,8 @@ watch:
   password3: v9xsKuqn_$d2y
 
 fs :
-#  commonApi: http://172.16.0.16:8010
-  commonApi: http://127.0.0.1:8010
+  commonApi: http://172.16.0.16:8010
+#  commonApi: http://127.0.0.1:8010
   h5CommonApi: http://119.29.195.254:8010
 nuonuo:
   key: 10924508
@@ -69,7 +69,7 @@ cloud_host:
 headerImg:
   imgUrl: https://fs-1346741853.cos.ap-chengdu.myqcloud.com/fs/20250323/6189704f2e134b84ad9c9e7c9999f103.jpg
 ipad:
-  ipadUrl: http://ipad.cdwjyyh.com
+  ipadUrl: http://qwipad.muyikp.com
 
 wx_miniapp_temp:
   pay_order_temp_id: VXEvKaGNPFuJmhWK9O_QPrTZxe9umDCukq-maI8Vdek

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

@@ -3,13 +3,11 @@ spring:
     # redis 配置
     redis:
         host: 172.27.0.6
-#        host: 127.0.0.1
         port: 6379
         # 数据库索引
         database: 0
         # 密码
         password: myhk888777666.
-#        password:
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -39,8 +37,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                  url: jdbc:mysql://cd-cdb-5vtn8yte.sql.tencentcdb.com:22680/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                  url: jdbc:mysql://172.27.0.17:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                  url: jdbc:mysql://172.27.0.17:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                   username: root
                   password: myhk888777666.
                 # 从库数据源
@@ -95,8 +92,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://cd-cdb-5vtn8yte.sql.tencentcdb.com:22680/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                    url: jdbc:mysql://172.27.0.17:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://172.27.0.17:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: myhk888777666.
                 # 初始连接数

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

@@ -193,7 +193,7 @@ public class WxUserController extends AppBaseController{
     public R courseLogin(@RequestBody LoginParam param) {
         return handleCourseLogin(param,
                 () -> WxMaConfiguration.getMaService("wxc84c6f789ba7f176"),
-                "彩虹汇医");
+                "木易华康在线");
     }
 
     /**