无库存的时候-1要回滚

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java

@@ -121,10 +121,15 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
         SweetIntegralActivityPrizeVo sweetIntegralActivityPrizeVo = SweetIntegralActivityPrizeVo.getNew().copy(sweetIntegralActivityPrize);
 
         // 减库存 顺便判断库存是否够 todo 这块可能不能这么判断 后台增加库存的时候如果是-1会丢库存 实际-1这个并没有发出
-        long activityPrizeNum = redisDataUtils.setIntegralActivityPrizeNum(integralActivityId, sweetIntegralActivityPrizeVo.getPrizeId(), 1);
-        long activityPrizeWinnersNum = redisDataUtils.setIntegralActivityPrizeWinnersNum(integralActivityId, sweetIntegralActivityPrizeVo.getPrizeId(), 1);
-        if (activityPrizeNum < 0 || activityPrizeWinnersNum < 0) {// 库存不够了
-            return ResponseDto.failure("活动太火爆了，奖品已经没有库存啦！");
+        long activityPrizeNum = redisDataUtils.decrIntegralActivityPrizeNum(integralActivityId, sweetIntegralActivityPrizeVo.getPrizeId(), 1);
+        long activityPrizeWinnersNum = redisDataUtils.decrIntegralActivityPrizeWinnersNum(integralActivityId, sweetIntegralActivityPrizeVo.getPrizeId(), 1);
+        if (activityPrizeNum < 0) {// 库存不够了
+            redisDataUtils.incrIntegralActivityPrizeNum(integralActivityId, sweetIntegralActivityPrizeVo.getPrizeId(), 1);
+            return ResponseDto.failure("活动太火爆了，奖品已经没有库存了！");
+        }
+        if (activityPrizeWinnersNum < 0) {// 库存不够了
+            redisDataUtils.incrIntegralActivityPrizeWinnersNum(integralActivityId, sweetIntegralActivityPrizeVo.getPrizeId(), 1);
+            return ResponseDto.failure("活动太火爆了，奖品已经没有库存了～");
         }
         // 减积分
         feignStoneIntegralClient.de2111(userId, integralActivity.getActivityNum(), integralActivity.getActivityTitle());

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -688,7 +688,7 @@ public class RedisDataUtils {
         }
     }
 
-    public long setIntegralActivityPrizeNum(String integralActivityId, String prizeId, int num) {
+    public long decrIntegralActivityPrizeNum(String integralActivityId, String prizeId, int num) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_NUM
                 .concat(integralActivityId)
                 .concat(":prizeId:")
@@ -697,7 +697,7 @@ public class RedisDataUtils {
         return decr;
     }
 
-    public long setIntegralActivityPrizeWinnersNum(String integralActivityId, String prizeId, int num) {
+    public long decrIntegralActivityPrizeWinnersNum(String integralActivityId, String prizeId, int num) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_WINNERS_NUM
                 .concat(integralActivityId)
                 .concat(":prizeId:")
@@ -706,6 +706,22 @@ public class RedisDataUtils {
         return decr;
     }
 
+    public void incrIntegralActivityPrizeNum(String integralActivityId, String prizeId, Integer num) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_NUM
+                .concat(integralActivityId)
+                .concat(":prizeId:")
+                .concat(prizeId);
+        long incr = redisUtil.incr(redisKey, num);
+    }
+
+    public void incrIntegralActivityPrizeWinnersNum(String integralActivityId, String prizeId, Integer num) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_WINNERS_NUM
+                .concat(integralActivityId)
+                .concat(":prizeId:")
+                .concat(prizeId);
+        long incr = redisUtil.incr(redisKey, num);
+    }
+
     public IntegralActivityDrawVo getIntegralActivityDrawInfo(String drawId) {
         String redisKeyDraw = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_INFO
                 .concat(drawId);