增加是否无限库存标识

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityPrizeFormParam.java

@@ -58,6 +58,10 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
     @NotNull(message = "prizeNum不能为空")
     private Integer prizeNum;
 
+    @ApiModelProperty(required = true, value = "是否是无限库存 1有限库存 2无限库存", example = "1")
+    @NotNull(message = "isInfinite不能为空")
+    private Integer isInfinite;
+
     @ApiModelProperty(required = true, value = "中奖概率", example = "1")
     @NotNull(message = "winningProbability不能为空")
     private BigDecimal winningProbability;
@@ -84,6 +88,7 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
         sweetIntegralActivityPrize.setPrizeType(source.getPrizeType());
         sweetIntegralActivityPrize.setPrizeTypeNum(source.getPrizeTypeNum());
         sweetIntegralActivityPrize.setPrizeNum(source.getPrizeNum());
+        sweetIntegralActivityPrize.setIsInfinite(source.getIsInfinite());
         sweetIntegralActivityPrize.setWinningProbability(source.getWinningProbability());
         return sweetIntegralActivityPrize;
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityServiceImpl.java

@@ -73,6 +73,9 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
                     String prizeId = IDGenerator.nextSnowId();
                     sweetIntegralActivityPrize.setPrizeId(prizeId);
                     sweetIntegralActivityPrize.setIntegralActivityId(integralActivityId);
+                    if (prize.getIsInfinite() == 2) {
+                        sweetIntegralActivityPrize.setPrizeNum(0);
+                    }
                     sweetIntegralActivityPrizeMapper.insert(sweetIntegralActivityPrize);
                     // 奖品库存
                     sweetRedisAdminUtils.incrIntegralActivityPrizeNum(integralActivityId, sweetIntegralActivityPrize.getPrizeId(), sweetIntegralActivityPrize.getPrizeNum());
@@ -119,22 +122,27 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
                     SweetIntegralActivityPrize sweetIntegralActivityPrize = SweetIntegralActivityPrizeFormParam.getNew().copy(prize);
                     sweetIntegralActivityPrize.setUpdatedAt(nowTime);
                     String prizeId = prize.getPrizeId();
-                    // 处理奖品库存
-                    SweetIntegralActivityPrize sweetIntegralActivityPrizeOld = sweetIntegralActivityPrizeMapper.selectOne(
-                            Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getPrizeId, prizeId)
-                    );
+                    if (prize.getIsInfinite() == 2) {
+                        sweetIntegralActivityPrize.setPrizeNum(0);
+                        sweetRedisAdminUtils.delIntegralActivityPrizeNum(integralActivityId, prizeId);
+                    } else {
+                        // 处理奖品库存
+                        SweetIntegralActivityPrize sweetIntegralActivityPrizeOld = sweetIntegralActivityPrizeMapper.selectOne(
+                                Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getPrizeId, prizeId)
+                        );
+                        Integer prizeNum = sweetIntegralActivityPrizeOld.getPrizeNum();
+                        Integer prizeNumNew = sweetIntegralActivityPrize.getPrizeNum();
+                        int prizeNumDiff = prizeNumNew - prizeNum;
+                        if (prizeNumDiff > 0) {//增加库存
+                            sweetRedisAdminUtils.incrIntegralActivityPrizeNum(integralActivityId, prizeId, prizeNumDiff);
+                        } else if(prizeNumDiff < 0) {// 减少库存
+                            sweetRedisAdminUtils.decrIntegralActivityPrizeNum(integralActivityId, prizeId, Math.abs(prizeNumDiff));
+                        }
+                    }
                     sweetIntegralActivityPrizeMapper.update(
                             sweetIntegralActivityPrize,
                             Wrappers.lambdaUpdate(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getPrizeId, prizeId)
                     );
-                    Integer prizeNum = sweetIntegralActivityPrizeOld.getPrizeNum();
-                    Integer prizeNumNew = sweetIntegralActivityPrize.getPrizeNum();
-                    int prizeNumDiff = prizeNumNew - prizeNum;
-                    if (prizeNumDiff > 0) {//增加库存
-                        sweetRedisAdminUtils.incrIntegralActivityPrizeNum(integralActivityId, prizeId, prizeNumDiff);
-                    } else if(prizeNumDiff < 0) {// 减少库存
-                        sweetRedisAdminUtils.decrIntegralActivityPrizeNum(integralActivityId, prizeId, Math.abs(prizeNumDiff));
-                    }
                 }
             }
             // 活动redis处理

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/utils/SweetRedisAdminUtils.java

@@ -36,7 +36,6 @@ public class SweetRedisAdminUtils {
                 .concat(prizeId);
         redisDataSourceUtil.getRedisSweetUtil().incr(redisKey, num);
     }
-
     public void decrIntegralActivityPrizeNum(String integralActivityId, String prizeId, Integer num) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_NUM
                 .concat(integralActivityId)
@@ -44,6 +43,13 @@ public class SweetRedisAdminUtils {
                 .concat(prizeId);
         redisDataSourceUtil.getRedisSweetUtil().decr(redisKey, num);
     }
+    public void delIntegralActivityPrizeNum(String integralActivityId, String prizeId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_NUM
+                .concat(integralActivityId)
+                .concat(SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_ID)
+                .concat(prizeId);
+        redisDataSourceUtil.getRedisSweetUtil().del(redisKey);
+    }
 
     public int getIntegralActivityPrizeNum(String integralActivityId, String prizeId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_NUM

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetIntegralActivityPrize.java

 package com.liquidnet.service.sweet.entity;
 
-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 积分活动奖品表
@@ -73,6 +71,11 @@ public class SweetIntegralActivityPrize implements Serializable, Cloneable {
      */
     private Integer prizeNum;
 
+    /**
+     * 是否是无限库存 1有限库存 2无限
+     */
+    private Integer isInfinite;
+
     /**
      * 中奖概率
      */

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweet_integral_activity_20211020.sql

@@ -40,6 +40,7 @@ CREATE TABLE `sweet_integral_activity_prize`
     `prize_type`           tinyint         NOT NULL DEFAULT 0 COMMENT '奖品类型 1积分 2优惠券 3实物 4登登登VIP',
     `prize_type_num`       int             NOT NULL DEFAULT 0 COMMENT '单次奖励数量如积分 中奖给多少',
     `prize_num`            int             NOT NULL DEFAULT 0 COMMENT '奖品数量库存',
+    `is_infinite`          tinyint         NOT NULL DEFAULT 1 COMMENT '是否是无限库存 1有限库存 2无限库存',
     `winning_probability`  decimal(10, 2)  NOT NULL DEFAULT 0 COMMENT '中奖概率',
     `created_at`           datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_at`           datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',