修复活动奖品保存

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityPlanRewardDao.java

@@ -25,7 +25,7 @@ public interface ActivityPlanRewardDao extends BaseMapper<ActivityPlanReward>{
 	 * @date 2022-08-17 11:13:13
 	 * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanRewardVo
 	 */
-	ActivityPlanReward detailByActivityIdAndRewardId(@Param("activityId") Long activityId,@Param("rewardId") Long rewardId);
+	ActivityPlanReward detailByActivityIdAndRewardId(@Param("activityId") Long activityId,@Param("rewardId") Long rewardId, @Param("group") String group);
 	/**
 	 * 分页查询
      * @author liweifan

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityPlanRewardService.java

@@ -25,7 +25,7 @@ public interface ActivityPlanRewardService extends IService<ActivityPlanReward>
      */
     ActivityPlanRewardVo detail(Long id);
 
-    ActivityPlanReward detailByActivityIdAndRewardId(Long activityId, Long rewardId);
+    ActivityPlanReward detailByActivityIdAndRewardId(Long activityId, Long rewardId, String group);
     /**
      * 分页查询
      *

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanRewardServiceImpl.java

@@ -52,8 +52,8 @@ public class ActivityPlanRewardServiceImpl extends ServiceImpl<ActivityPlanRewar
     }
 
     @Override
-    public ActivityPlanReward detailByActivityIdAndRewardId(Long activityId, Long rewardId) {
-        return baseMapper.detailByActivityIdAndRewardId(activityId, rewardId);
+    public ActivityPlanReward detailByActivityIdAndRewardId(Long activityId, Long rewardId, String group) {
+        return baseMapper.detailByActivityIdAndRewardId(activityId, rewardId, group);
     }
 
     @Override
@@ -81,7 +81,7 @@ public class ActivityPlanRewardServiceImpl extends ServiceImpl<ActivityPlanRewar
                                             , (param) -> {
                                                 ActivityRewardVo detail = activityRewardService.detail(param.getRewardId());
 
-                                                ActivityPlanReward old = detailByActivityIdAndRewardId(param.getActivityId(), param.getRewardId());
+                                                ActivityPlanReward old = detailByActivityIdAndRewardId(param.getActivityId(), param.getRewardId(), param.getGroup());
                                                 if (null == old) {
                                                     Integer stock = detail.getStock() - param.getRewardNum();
                                                     if (stock < 0) {
@@ -161,7 +161,7 @@ public class ActivityPlanRewardServiceImpl extends ServiceImpl<ActivityPlanRewar
                                             , (param) -> {
                                                 ActivityRewardVo detail = activityRewardService.detail(param.getRewardId());
 
-                                                ActivityPlanReward old = detailByActivityIdAndRewardId(param.getActivityId(), param.getRewardId());
+                                                ActivityPlanReward old = detailByActivityIdAndRewardId(param.getActivityId(), param.getRewardId(), reward.getGroup());
 
                                                 if (old.getRewardNum() > 0) {
                                                     //入库存变更记录

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanServiceImpl.java

@@ -643,11 +643,16 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
         for (ActivityPlanRewardDto item : updateRewardDtoList) {
             // activityPlanRewardService.saveOrUpdateReward(item);
 
+            // 设置默认值
+            if (StringUtils.isEmpty(item.getGroup())) {
+                item.setGroup("1");
+            }
+
             // 评测活动
             if (ActivityTypeEnum.EVALUATION == activityPlan.getActivityType()) {
                 item.setRewardNum(ret);
             }
-            planReward = activityPlanRewardService.detailByActivityIdAndRewardId(item.getActivityId(), item.getRewardId());
+            planReward = activityPlanRewardService.detailByActivityIdAndRewardId(item.getActivityId(), item.getRewardId(), item.getGroup());
 
             if (Objects.isNull(planReward)) {
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanRewardMapper.xml

@@ -31,7 +31,7 @@
         SELECT
             <include refid="baseColumns"/>
         FROM activity_plan_reward t
-        where t.activity_id_ = #{activityId} and t.reward_id_ = #{rewardId}
+        where t.activity_id_ = #{activityId} and t.reward_id_ = #{rewardId} AND t.group_ = #{group}
     </select>
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanRewardVo">