抽奖数据迁移

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

@@ -409,13 +409,13 @@ public class RedisDataUtils {
         String redisAll = SweetConstant.REDIS_KEY_SWEET_LUCK_DRAW_ALL.concat(luckDrawNum);
         String redisPresent = SweetConstant.REDIS_KEY_SWEET_LUCK_DRAW_PRESENT_MOBILE.concat(mobile);
 
-        int surplus = (int) redisUtil.get(redisSurplus);
-        int prize = (int) redisUtil.get(redisAll) + 1;
-        int prizeALl = (int) redisUtil.get(redisAll) + 1;
+        int surplus = (int) redisUtil.get(redisSurplus);//当前中奖数量
+        int prize = (int) redisUtil.get(redisAll);//总量
+        int prizeALl = (int) redisUtil.get(redisAll) + 1;//不变的总量
 
         int count = (int) redisUtil.incr(redisKey, 1);
         if (count > 2) {
-            vo.setPrize(prize);
+            vo.setPrize(prizeALl);
             vo.setPrizeAll(prizeALl);
             return vo;
         }
@@ -435,7 +435,6 @@ public class RedisDataUtils {
                 surplus = (int) redisUtil.get(redisSurplus);
                 if (surplus < prize) {
                     surplus = (int) redisUtil.incr(redisSurplus, 1);
-                    prize = surplus;
                     redisUtil.set(redisKey, 2);
                 }
             }
@@ -443,12 +442,12 @@ public class RedisDataUtils {
 
         sqls.add(SqlMapping.get("sweet_luck_draw.insert"));
         sqlsDataA.add(new Object[]{
-                mobile, luckDrawNum, prize, prizeALl, now
+                mobile, luckDrawNum, surplus, prize, now
         });
         queueUtils.sendMsgByRedis(MQConst.SweetQueue.LUCK_DRAW.getKey(),
                 SqlMapping.gets(sqls, sqlsDataA));
 
-        vo.setPrize(prize);
+        vo.setPrize(surplus);
         vo.setPrizeAll(prizeALl);
         return vo;
     }