抽奖3次后 修改概率

redis 工具类 新增返回 map<String,List<T>> 格式

src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java

@@ -151,10 +151,10 @@ public class DiscSpinningController {
     public Result draw(@ApiIgnore @RequestAttribute("userId") Long userId, @Nullable @ApiIgnore @RequestBody Map maps) {
         double amount = 0;
         Long orderId = null;
+        Integer i = recordService.countDraw(userId);
         if (maps == null || !maps.containsKey("source") || !"task".equals(maps.get("source"))) {
             //任务抽奖
             int drawCount = Integer.parseInt(commonRepository.findOne(901).getValue());
-            Integer i = recordService.countDraw(userId);
             if (i != null && i >= drawCount) {
                 return Result.error("当日可抽奖次数已超限");
             }
@@ -166,7 +166,7 @@ public class DiscSpinningController {
             }
         }
         return new Result().put("data",
-                discSpinningService.draws(amount, orderId, userId, maps == null || maps.get("source") == null ? "order" : maps.get("source").toString()));
+                discSpinningService.draws(i == null ? 1 : i + 1, amount, orderId, userId, maps == null || maps.get("source") == null ? "order" : maps.get("source").toString()));
     }
 
     @ApiOperation("大转盘奖项领取")

src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningAmount.java

@@ -18,6 +18,8 @@ import lombok.Data;
 public class DiscSpinningAmount extends Model<DiscSpinningAmount> {
     @ApiModelProperty("主键id")
     private Long id;
+    @ApiModelProperty("从第几次开始变化")
+    private Integer num;
     @ApiModelProperty("描述")
     private String name;
     @ApiModelProperty("0-1 小于 多少为该奖励")

src/main/java/com/sqx/modules/discSpinning/service/DiscSpinningService.java

@@ -8,7 +8,7 @@ import com.sqx.modules.discSpinning.entity.DiscSpinningRecord;
 public interface DiscSpinningService extends IService<DiscSpinning> {
 
     //抽奖
-    DiscSpinningRecord draws(double orderAmount, Long orderId, Long userId, String source);
+    DiscSpinningRecord draws(int drawCount, double orderAmount, Long orderId, Long userId, String source);
 
     //领奖
     void receiveAsync(DiscSpinningRecord receive);

src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java

@@ -33,10 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 @Service
 public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSpinning> implements DiscSpinningService {
@@ -125,11 +122,11 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
                 cashOut.setState(2);
                 if (baseResp.getErrorMsg().contains("收款人账户号出款属性不匹配")) {
                     cashOut.setRefund("提现失败,请检查支付宝账号与收款人姓名后,重试。");
-                }else {
+                } else {
                     cashOut.setRefund(baseResp.getErrorMsg());
                 }
             }
-        }else {
+        } else {
             UserMoneyDetails userMoneyDetails = new UserMoneyDetails(
                     userInfo.getUserId(), null, null, "[现金大转盘]", 4, 2, 1,
                     new BigDecimal(money), "现金红包自动提现" + money + "元", 1);
@@ -142,7 +139,7 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
 
     @Override
     @Transactional
-    public DiscSpinningRecord draws(double orderAmount, Long orderId, Long userId, String source) {
+    public DiscSpinningRecord draws(int drawCount, double orderAmount, Long orderId, Long userId, String source) {
         DiscSpinning result = new DiscSpinning("谢谢惠顾", 1, null);
         List<DiscSpinning> prizes = baseMapper.selectList(new QueryWrapper<DiscSpinning>().eq("disc_type", "order".equals(source) ? 1 : 2).orderByAsc("odds"));
 
@@ -153,7 +150,14 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
         } while (randomDouble == 0);
         BigDecimal randomNum = new BigDecimal(randomDouble).multiply(new BigDecimal(10000)).divide(new BigDecimal(100));
 
-        List<DiscSpinningAmount> amounts = redisUtils.getListData(RedisKeys.getDateKey("spinning:amount"), DiscSpinningAmount.class, "setDiscSpinningAmounts");
+        List<DiscSpinningAmount> amounts = new ArrayList<>();
+        Map<String, List<DiscSpinningAmount>> amountMaps = redisUtils.getMapData(RedisKeys.getDateKey("spinning:amount"), "setDiscSpinningAmounts", DiscSpinningAmount.class);
+        for (int i = drawCount; i >= 0; i--) {
+            if (amountMaps.containsKey(i + "")) {
+                amounts = amountMaps.get(i + "");
+                break;
+            }
+        }
         for (DiscSpinning prize : prizes) {
             if (randomNum.compareTo(prize.getNumber()) < 0) {
                 if (prize.getType() == 2) {