益寿缘app-优化App看课奖励创建套餐包订单逻辑

fs-service/src/main/java/com/fs/his/mapper/FsUserRewardsMapper.java

@@ -121,5 +121,5 @@ public interface FsUserRewardsMapper {
      * @param fsUserId 用户ID
      * @param activityType 活动类型
      * */
-    List<FsUserRewards> selectTodayListDataByUserIdAndActivityType(Long fsUserId, String activityType);
+    List<FsUserRewards> selectTodayListDataByUserIdAndActivityType(@Param("fsUserId") Long fsUserId,@Param("activityType") String activityType);
 }

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

@@ -237,9 +237,9 @@ public class AppUserRewardServiceImpl implements IAppUserRewardService {
                     Integer day = ((Number) item.get("day")).intValue();
                     if (day.equals(targetDay)) {
                         if (isRedPackage) {
-                            return (T) new BigDecimal(item.get("amount").toString());
+                            return (T) new BigDecimal(item.get("value").toString());
                         } else {
-                            return (T) Long.valueOf(((Number) item.get("amount")).longValue());
+                            return (T) Long.valueOf(((Number) item.get("value")).longValue());
                         }
                     }
                 }
@@ -312,7 +312,7 @@ public class AppUserRewardServiceImpl implements IAppUserRewardService {
             return fsAppRole;
         }
 
-        // 2. 查奖品表判断是否已发放奖励
+        // 2. 查奖品表判断是否已发放登录注册奖励
         FsUserRewards queryReward = rewardsMapper.selectByUserIdAndFirstLoginType(fsUserId);
         if (queryReward == null) {
             //查询当前用户对应的角色配置返回红包、积分、商品弹窗信息

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

@@ -99,6 +99,7 @@ public class FirstLoginProductStrategy implements RewardStrategy {
         param.setUserId(fsUser.getUserId());
         param.setAddressId(reward.getAddressId());
         param.setPackageId(reward.getGoodsId());
+        param.setPayType(1);//全款
         return param;
     }
 

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

@@ -99,6 +99,7 @@ public class WatchCourseProductStrategy  implements RewardStrategy {
         param.setUserId(fsUser.getUserId());
         param.setAddressId(reward.getAddressId());
         param.setPackageId(reward.getGoodsId());
+        param.setPayType(1);//全款
         return param;
     }
 

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

@@ -161,7 +161,7 @@ public class AppUserRewardController  extends AppBaseController{
     }
 
     /**
-     * 记录用户累计有效看课标识
+     * 记录用户当日的有效看课标识
      */
     @Login
     @ApiOperation("记录用户累计有效看课标识")