Merge remote-tracking branch 'origin/dev-sweet' into dev-sweet

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -15,6 +15,7 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_SHOP = "sweet:artists:shop:manual:";
 
     public final static String REDIS_KEY_SWEET_LUCK_DRAW = "sweet:luckDraw:mobile:";
+    public final static String REDIS_KEY_SWEET_LUCK_DRAW_RESULT = "sweet:luckDraw:num:";
     public final static String REDIS_KEY_SWEET_LUCK_DRAW_SURPLUS = "sweet:luckDraw:num:";//中奖库存
     public final static String REDIS_KEY_SWEET_LUCK_DRAW_ALL = "sweet:luckDraw:num:";//中奖总量
     public final static String REDIS_KEY_SWEET_LUCK_DRAW_PRESENT_MOBILE = "sweet:luckDraw:present:mobile:";//中奖库存

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java

@@ -336,6 +336,7 @@ public class SweetAppletController {
 
         HashMap<String, Integer> hashMap = CollectionUtil.mapStringInteger();
         hashMap.put("count", redisDataUtils.getLuckDrawStatus(mobile, luckDrawNum));
+        hashMap.put("prize", redisDataUtils.getLuckDrawResult(mobile, luckDrawNum));
         return ResponseDto.success(hashMap);
     }
 

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

@@ -404,6 +404,17 @@ public class RedisDataUtils {
         }
     }
 
+    //获取抽奖状态
+    public int getLuckDrawResult(String mobile, String luckDrawNum) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_LUCK_DRAW_RESULT.concat(luckDrawNum).concat(":mobile:" + mobile);
+        Object obj = redisUtil.get(redisKey);
+        if(obj==null){
+            return 0;
+        }else{
+            return (int) redisUtil.get(redisKey);
+        }
+    }
+
     //修改抽奖状态
     public SweetPrizeVo changeLuckDrawStatus(String mobile, String unionId,String luckDrawNum) {
         LinkedList<String> sqls = CollectionUtil.linkedListString();
@@ -444,6 +455,7 @@ public class RedisDataUtils {
                 if (surplus < prizeALl) {
                     prize = (int) redisUtil.incr(redisSurplus, 1);
                     redisUtil.set(redisKey, 2);
+                    redisUtil.set(SweetConstant.REDIS_KEY_SWEET_LUCK_DRAW_RESULT.concat(luckDrawNum).concat(":mobile:" + mobile),prize);
                 }
             }
         }