app 发红包修改

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

@@ -5013,10 +5013,10 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
 
         // 判断来源是否是app，如是app，则发放积分奖励
-        int sourceApp = 3;
-        if (sourceApp == param.getSource() /*&& !CloudHostUtils.hasCloudHostName("中康")*/) {
-            return sendIntegralReward(param, user, log, config);
-        }
+//        int sourceApp = 3;
+//        if (sourceApp == param.getSource() /*&& !CloudHostUtils.hasCloudHostName("中康")*/) {
+//            return sendIntegralReward(param, user, log, config);
+//        }
         if (ObjectUtils.isEmpty(param.getRewardType())){
             param.setRewardType(config.getRewardType());
         }
@@ -5031,9 +5031,8 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
                     return R.error("请重新使用微信登录");
                 }
                 packetParam.setOpenId(openId);
-                packetParam.setAmount(fsCourseRedPacketLog.getAmount());
-                packetParam.setSource(param.getSource());
-                packetParam.setAppId(param.getAppId());
+                BeanUtils.copyProperties(param, packetParam);
+
                 return sendAppRedPacket(packetParam, log,video, config);
             // 积分奖励
             case 2:
@@ -5290,6 +5289,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         } else if (video != null && video.getRedPacketMoney() != null) {
             amount = video.getRedPacketMoney();
         }
+        packetParam.setAmount(amount);
 
         if (amount.compareTo(BigDecimal.ZERO) > 0) {
 

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

@@ -2007,14 +2007,15 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
 
 
         try {
+            logger.info("app商家转账开始:[param:{}]", request);
             TransferBillsResult transferBillsResult = transferService.transferBills(request);
-            logger.info("商家转账支付完成:[msg:{}]", transferBillsResult);
+            logger.info("Method...商家转账支付完成:[msg:{}]", transferBillsResult);
             return R.ok("发送红包成功").put("data", transferBillsResult).put("mchId", config.getMchId())
                     .put("package",transferBillsResult.getPackageInfo())
                     .put("appId",param.getAppId())
                     .put("orderCode",request.getOutBillNo());
         } catch (Exception e) {
-            logger.error("商家转账支付失败:参数: {} ：原因: {}", com.alibaba.fastjson.JSON.toJSONString(param), e.getMessage(),e);
+            logger.error("app商家转账支付失败:参数: {} ：原因: {}", request, e.getMessage(),e);
             throw new RuntimeException(e);
         }
     }