Merge branch 'dev_v1.3.4_20220914' of http://git.dayaedu.com/yonge/cooleshow into dev_v1.3.4_20220914

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityPlanReward.java

@@ -37,6 +37,11 @@ public class ActivityPlanReward implements Serializable {
     @NotNull(message = "奖品数量不能为空")
     @PositiveOrZero(message = "奖品数量必须大于等于0")
     private Integer rewardNum;
+
+    @ApiModelProperty("奖品库存 ")
+    @TableField(value = "reward_stock_")
+    private Integer rewardStock;
+
     @ApiModelProperty("创建时间 ")
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -47,7 +52,15 @@ public class ActivityPlanReward implements Serializable {
     @TableField(value = "group_")
     private String group;
 
-	public Long getId() {
+    public Integer getRewardStock() {
+        return rewardStock;
+    }
+
+    public void setRewardStock(Integer rewardStock) {
+        this.rewardStock = rewardStock;
+    }
+
+    public Long getId() {
         return id;
     }
 

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

@@ -649,6 +649,7 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
                 item.setGroup("1");
             }
 
+            item.setRewardStock(item.getRewardNum());
             // 评测活动
             if (ActivityTypeEnum.EVALUATION == activityPlan.getActivityType()) {
                 item.setRewardNum(ret);

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

@@ -6,6 +6,7 @@
 	        <result column="activity_id_" property="activityId" />
 	        <result column="reward_id_" property="rewardId" />
 	        <result column="reward_num_" property="rewardNum" />
+	        <result column="reward_stock_" property="rewardStock" />
 	        <result column="create_time_" property="createTime" />
 		</resultMap>  
     
@@ -15,6 +16,7 @@
         , t.activity_id_ as activityId
         , t.reward_id_ as rewardId
         , t.reward_num_ as rewardNum
+        , t.reward_stock_ as rewardStock
         , t.group_ AS `group`
         , t.create_time_ as createTime
         </sql>
@@ -84,6 +86,6 @@
 
 
 	<update id="reduceStock">
-        update activity_plan_reward set reward_num_ = reward_num_ - 1 where #{activityId} = activity_id_ and #{rewardId} = reward_id_ and reward_num_ > 0
+        update activity_plan_reward set reward_stock_ = reward_stock_ - 1 where #{activityId} = activity_id_ and #{rewardId} = reward_id_ and reward_stock_ > 0
     </update>
 </mapper>