修改抽奖

share-system/src/main/java/share/system/domain/LotteryRecordsLog.java

@@ -73,9 +73,9 @@ public class LotteryRecordsLog extends BaseEntity {
     private String hitPrize;
 
     /**
-     * 是否发放 1未发放，2 已发放 3 发放失败
+     * 是否发放 0:未发放,1:已发放
      */
-    @Excel(name = "	是否发放 1未发放，2 已发放 3 发放失败")
+    @Excel(name = "	是否发放 0:未发放，1:已发放")
     private Integer isSend;
 
     /**

share-system/src/main/java/share/system/service/impl/WheelGameServiceImpl.java

@@ -134,7 +134,7 @@ public class WheelGameServiceImpl extends ServiceImpl<WheelGameMapper, WheelGame
         }
 
         List<Prize> prizeList = prizeService.list(new LambdaQueryWrapper<Prize>().eq(Prize::getGameId, wheelGame.getId()));
-        Prize prize = luckDraw(prizeList, wheelGame.getId());
+        Prize prize = luckDraw(prizeList, user.getId());
 
         LotteryRecordsLog log = new LotteryRecordsLog();
         log.setGameId(wheelGame.getId());
@@ -149,13 +149,10 @@ public class WheelGameServiceImpl extends ServiceImpl<WheelGameMapper, WheelGame
             try {
                 switch (couponType) {
                     case COUPON:
-                        SConsumerCoupon sConsumerCoupon = new SConsumerCoupon();
-                        sConsumerCoupon.setConsumerId(user.getId());
-                        sConsumerCoupon.setCouponId(prize.getCouponId());
                         SConsumerCoupon give = sConsumerCouponService.give(user.getId(), prize.getCouponId(), 30);
                         log.setIsHit(YesNoEnum.yes.getIndex());
                         log.setIsSend(YesNoEnum.yes.getIndex());
-                        log.setHitPrize(prize.getPrizeName() + ":" + give.getName());
+                        log.setHitPrize(PrizeTypeEnum.COUPON.getName());
                         log.setSendMsg(PrizeTypeEnum.COUPON.getName() + ":" + give.getName() + "以发放");
                         lotteryRecordsLogService.save(log);
                         prize.setCurrentNum(prize.getCurrentNum() + YesNoEnum.yes.getIndex());
@@ -166,7 +163,7 @@ public class WheelGameServiceImpl extends ServiceImpl<WheelGameMapper, WheelGame
                     case GOODS:
                         log.setIsHit(YesNoEnum.yes.getIndex());
                         log.setIsSend(YesNoEnum.yes.getIndex());
-                        log.setHitPrize(PrizeTypeEnum.GOODS.getName() + ":" + prize.getPrizeName());
+                        log.setHitPrize(PrizeTypeEnum.GOODS.getName());
                         log.setSendMsg(PrizeTypeEnum.GOODS.getName() + ":" + prize.getPrizeName() + "以发放");
                         lotteryRecordsLogService.save(log);
                         prize.setCurrentNum(prize.getCurrentNum() + YesNoEnum.yes.getIndex());