用户获得的幸运奖不扣除峰值

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/dailyawardrecords/DailyAwardRecordsServiceImpl.java

@@ -240,14 +240,14 @@ public class DailyAwardRecordsServiceImpl implements DailyAwardRecordsService {
             // 获取用户钱包
             IntegralDO integral = integralService.getIntegral(user.getUserId());
             // 用户峰值
-            Long highQuota = integral.getHighQuota();
+//            Long highQuota = integral.getHighQuota();
             // 超出幸运奖
-            Long exceedAmount = 0L;
+//            Long exceedAmount = 0L;
 
-            if (highQuota < amount) {
-                exceedAmount = highQuota;
-                amount = highQuota;
-            }
+//            if (highQuota < amount) {
+//                exceedAmount = highQuota;
+//                amount = highQuota;
+//            }
 
             Long yellowIntegral = (long) (amount * bonusYellowIntegral);
             Long greenIntegral = (long) (amount * bonusGreenIntegral);
@@ -255,10 +255,10 @@ public class DailyAwardRecordsServiceImpl implements DailyAwardRecordsService {
             log.info("{}-用户获得了幸运奖{}层 :￥{}", integral.getUserName(), user.getDepth(),amount);
 
             // 增加用户积分
-            integral.setHighQuota(integral.getHighQuota() - amount);
+//            integral.setHighQuota(integral.getHighQuota() - amount);
             integral.setYellowCurrentQuota(integral.getYellowCurrentQuota() + yellowIntegral);
             integral.setGreenCurrentQuota(integral.getGreenCurrentQuota() + greenIntegral);
-            integral.setLuckyQuota(integral.getLuckyQuota() + amount);
+//            integral.setLuckyQuota(integral.getLuckyQuota() + amount);
 
             integralList.add(integral);
 
@@ -267,9 +267,9 @@ public class DailyAwardRecordsServiceImpl implements DailyAwardRecordsService {
                     .integralPoints(yellowIntegral)
                     .practicalIntegralPoints(yellowIntegral)
                     .afterIntegralPoints(integral.getYellowCurrentQuota())
-                    .maxAvailablePointsAmount(-amount)
-                    .afterMaxAvailablePointsAmount(integral.getHighQuota())
-                    .luckyQuotaAmount(exceedAmount)
+//                    .maxAvailablePointsAmount(-amount)
+//                    .afterMaxAvailablePointsAmount(integral.getHighQuota())
+//                    .luckyQuotaAmount(exceedAmount)
                     .integralStatus(LUCKY_BONUS.getType())
                     .integralType(IntegralTypeEnum.YELLOW_INTEGRAL.getType())
                     .build();