益寿缘-优化App看课红包接口

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

@@ -3052,16 +3052,16 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     }
 
     /**
-     * 发放红包奖励
+     * App发放红包
      *
      * @param param 请求参数
      * @param user 用户信息
-     * @param log 观看日志
+     * @param watchLog 观看日志
      * @param video 视频信息
      * @param config 配置信息
      * @return 处理结果
      */
-    private R sendAppRedPacketRewardFsUser(FsCourseSendRewardUParam param, FsUser user, FsCourseWatchLog log, FsUserCourseVideo video, CourseConfig config) {
+    private R sendAppRedPacketRewardFsUser(FsCourseSendRewardUParam param, FsUser user, FsCourseWatchLog watchLog, FsUserCourseVideo video, CourseConfig config) {
 
         FsUserCoursePeriodDays periodDays = new FsUserCoursePeriodDays();
         periodDays.setVideoId(param.getVideoId());
@@ -3087,16 +3087,10 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
         // 准备发送红包参数
         WxSendRedPacketParam packetParam = new WxSendRedPacketParam();
-        packetParam.setOpenId(user.getMpOpenId());
-        //判断服务号配置是否存在
-        if (StringUtils.isNotEmpty(config.getMpAppId())){
-            packetParam.setMpAppId(config.getMpAppId());
-        }
         //组装发红包数据
         packetParam.setAmount(amount);
         packetParam.setSource(param.getSource());
         packetParam.setRedPacketMode(config.getRedPacketMode());
-        packetParam.setCompanyId(param.getCompanyId());
         packetParam.setAppId(openProperties.getAppId());
         packetParam.setUser(user);
         packetParam.setOpenId(user.getAppOpenId());
@@ -3108,6 +3102,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
         // 发送App红包
         R sendRedPacket = paymentService.sendRedPacketAppReward(packetParam);
+        log.info("App发放红包结果："+sendRedPacket);
         if (sendRedPacket.get("code").equals(200)) {
             FsCourseRedPacketLog redPacketLog = new FsCourseRedPacketLog();
             TransferBillsResult transferBillsResult;
@@ -3129,15 +3124,15 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             redPacketLog.setCompanyUserId(param.getCompanyUserId());
             redPacketLog.setCreateTime(new Date());
             redPacketLog.setAmount(amount);
-            redPacketLog.setWatchLogId(log.getLogId() != null ? log.getLogId() : null);
+            redPacketLog.setWatchLogId(watchLog.getLogId() != null ? watchLog.getLogId() : null);
             redPacketLog.setPeriodId(param.getPeriodId());
             redPacketLog.setAppId(param.getAppId());
 
             redPacketLogMapper.insertFsCourseRedPacketLog(redPacketLog);
 
             // 更新观看记录的奖励类型
-            log.setRewardType(config.getRewardType());
-            courseWatchLogMapper.updateFsCourseWatchLog(log);
+            watchLog.setRewardType(config.getRewardType());
+            courseWatchLogMapper.updateFsCourseWatchLog(watchLog);
 
             return sendRedPacket;
         } else {

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

@@ -625,7 +625,7 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
             // 显式将 packageInfo 放到顶层，确保能被正确序列化
             result.put("packageInfo", transferResult.getPackageInfo());
         }
-        logger.info("app奖品红包返回：{}", result);
+        logger.info("app发放红包返回：{}", result);
         return result;
     }
 

fs-service/src/main/java/com/fs/his/strategy/impl/FirstLoginRedPacketStrategy.java

@@ -37,7 +37,7 @@ public class FirstLoginRedPacketStrategy implements RewardStrategy {
     private FsAppRewardCourseRedPacketLogMapper appRewardCourseRedPacketLogMapper;
     @Override
     public RewardResult process(FsUserRewards reward) {
-        log.info("处理首次登录红包发放: rewardId={}", reward.getId());
+        log.info("处理首次登录-弹窗红包-发放: rewardId={}", reward.getId());
         try {
             FsUser fsUser=fsUserMapper.selectFsUserById(reward.getFsUserId());
             if (fsUser!=null){
@@ -47,9 +47,7 @@ public class FirstLoginRedPacketStrategy implements RewardStrategy {
                 WxSendRedPacketParam param=buildRedPacketParam(reward, fsUser);
                 //调用发送红包接口逻辑
                 R sendRedPacket = fsStorePaymentService.sendRedPacketAppReward(param);
-                log.info("首次登录红包发放结果："+sendRedPacket);
                 if (sendRedPacket.get("code").equals(200)) {
-                    String packageInfo = (String) sendRedPacket.get("packageInfo");
                     FsAppRewardCourseRedPacketLog record=new FsAppRewardCourseRedPacketLog();
                     TransferBillsResult transferBillsResult;
                     if (sendRedPacket.get("isNew").equals(1)) {
@@ -78,12 +76,12 @@ public class FirstLoginRedPacketStrategy implements RewardStrategy {
                     appRewardCourseRedPacketLogMapper.insert(record);
                     return RewardResult.successWithExt(sendRedPacket);
                 } else {
-                    return RewardResult.fail("红包发放失败，请联系客服");
+                    return RewardResult.fail("首次登录-弹窗红包-发放失败，请联系客服");
                 }
             }
-            return RewardResult.fail("红包发放失败，用户不存在");
+            return RewardResult.fail("首次登录-弹窗红包-发放失败，用户不存在");
         } catch (Exception e) {
-            throw new RuntimeException("首次注册积分发放失败", e);
+            throw new RuntimeException("首次登录-弹窗红包-发放失败", e);
         }
     }
 

fs-service/src/main/java/com/fs/his/strategy/impl/WatchCourseRedPacketStrategy.java

@@ -41,7 +41,7 @@ public class WatchCourseRedPacketStrategy implements RewardStrategy {
     private FsAppRewardCourseRedPacketLogMapper appRewardCourseRedPacketLogMapper;
     @Override
     public RewardResult process(FsUserRewards reward) {
-        log.info("处理看课红包发放: rewardId={}", reward.getId());
+        log.info("处理App看课-弹窗红包-发放: rewardId={}", reward.getId());
         try {
             FsUser fsUser=fsUserMapper.selectFsUserById(reward.getFsUserId());
             if (fsUser!=null){
@@ -81,13 +81,13 @@ public class WatchCourseRedPacketStrategy implements RewardStrategy {
                     appRewardCourseRedPacketLogMapper.insert(record);
                     return RewardResult.successWithExt(sendRedPacket);
                 } else {
-                    return RewardResult.fail("App看课奖励红包发放失败，请联系客服");
+                    return RewardResult.fail("App看课-弹窗红包-发放失败，请联系客服");
                 }
             }
             return RewardResult.success();
 
         } catch (Exception e) {
-            return RewardResult.fail("App看课奖励红包发放失败，请联系客服");
+            return RewardResult.fail("App看课-弹窗红包-发放失败，请联系客服");
         }
     }
 

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

@@ -14,10 +14,7 @@ import com.fs.course.param.FsCourseLinkCreateParam;
 import com.fs.course.service.impl.FsUserCourseVideoServiceImpl;
 import com.fs.fastGpt.domain.FastGptPushTokenTotal;
 import com.fs.qw.domain.*;
-import com.fs.qw.mapper.QwCompanyMapper;
-import com.fs.qw.mapper.QwGroupMsgItemMapper;
-import com.fs.qw.mapper.QwGroupMsgMapper;
-import com.fs.qw.mapper.QwGroupMsgUserMapper;
+import com.fs.qw.mapper.*;
 import com.fs.qw.param.QwCountCustomerParam;
 import com.fs.qw.param.QwGroupMsgDetailsParam;
 import com.fs.qw.param.QwGroupMsgParam;
@@ -32,6 +29,7 @@ import com.fs.qwApi.param.QwMsgTemplate;
 import com.fs.qwApi.service.QwApiService;
 import com.fs.sop.service.IQwSopService;
 import com.fs.voice.utils.StringUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -57,6 +55,7 @@ import static com.fs.course.utils.LinkUtil.generateRandomStringWithLock;
  * @date 2024-06-20
  */
 @Service
+@Slf4j
 public class QwGroupMsgServiceImpl implements IQwGroupMsgService
 {
 

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

@@ -141,7 +141,7 @@ public class CourseFsUserController extends AppBaseController {
     }
 
 
-    @ApiOperation("app发放奖励")
+    @ApiOperation("app发放红包")
     @PostMapping("/appSendReward")
     @UserOperationLog(operationType = FsUserOperationEnum.SENDREWARD)
     @RepeatSubmit