|
|
@@ -1142,7 +1142,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
return sendIntegralReward(param,user, log, config);
|
|
|
// 红包+积分
|
|
|
case 3:
|
|
|
- R sendRed = sendRedPacketReward(param, user, log, video, config);
|
|
|
+ R sendRed = sendRedPacketRewardFsUser(param, user, log, video, config);
|
|
|
if (!Objects.equals(sendRed.get("code"), 200)) {
|
|
|
return sendRed;
|
|
|
}
|
|
|
@@ -1344,9 +1344,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
BigDecimal amount = BigDecimal.ZERO;
|
|
|
FsUserCourseVideoRedPackage redPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyId(param.getVideoId(), param.getCompanyId(), param.getPeriodId());
|
|
|
|
|
|
- if (redPackage != null) {
|
|
|
+ if (redPackage != null && redPackage.getRedPacketMoney() != null) {
|
|
|
amount = redPackage.getRedPacketMoney();
|
|
|
- } else if (video != null) {
|
|
|
+ } else if (video != null && video.getRedPacketMoney() != null) {
|
|
|
amount = video.getRedPacketMoney();
|
|
|
}
|
|
|
|
|
|
@@ -1586,6 +1586,11 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
courseWatchLogMapper.updateFsCourseWatchLog(log);
|
|
|
logger.info("发放奖励====================》看课记录,{}",log);
|
|
|
|
|
|
+ // 红德堂不要积分转红包
|
|
|
+ if (CloudHostUtils.hasCloudHostName("弘德堂")) {
|
|
|
+ return R.ok("奖励发放成功").put("rewardType",config.getRewardType());
|
|
|
+ }
|
|
|
+
|
|
|
//转换红包
|
|
|
FsCourseRedPacketLog redPacketLog = new FsCourseRedPacketLog();
|
|
|
redPacketLog.setCourseId(param.getCourseId());
|
ct