From 4b80d2dab78d0cef3d149a0a11240b5e39b581a3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 04 三月 2019 17:26:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
index 6cc19ba..d21e90f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
@@ -80,8 +80,6 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
- // 鏈�澶ф娊濂栨鏁�
- private static int MAX_COUNT = 5;
/**
* 鐢ㄦ埛鍒稿垪琛ㄦ煡璇�
@@ -462,10 +460,10 @@
List<DeviceLotteryRecord> list = deviceLotteryRecordService.listByPlatformAndDevice(platformType,
device);
- if (list != null && list.size() == MAX_COUNT) { // 鏃犳娊濂栨満浼�
+ if (list != null && list.size() == Constant.MAX_COUNT_LOTTERY_NEWBIES) { // 鏃犳娊濂栨満浼�
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "鎶藉娆℃暟涓嶈冻"));
return;
- } else if (list != null && list.size() < MAX_COUNT) { // 鎷ユ湁鎶藉鏈轰細
+ } else if (list != null && list.size() < Constant.MAX_COUNT_LOTTERY_NEWBIES) { // 鎷ユ湁鎶藉鏈轰細
for (DeviceLotteryRecord deviceLotteryRecord : list) {
Long systemCouponId = deviceLotteryRecord.getSystemCouponId();
@@ -481,14 +479,14 @@
hasPrize = coupon.getType().name();
}
- count = MAX_COUNT - 1 - list.size();
+ count = Constant.MAX_COUNT_LOTTERY_NEWBIES - 1 - list.size();
} else {
- count = MAX_COUNT - 1;
+ count = Constant.MAX_COUNT_LOTTERY_NEWBIES - 1;
}
// 濂栧搧
- prize = getLotteryPrize(MAX_COUNT, countPrize, list.size(), couponId);
+ prize = getLotteryPrize(Constant.MAX_COUNT_LOTTERY_NEWBIES, countPrize, list.size(), couponId);
// 鎶戒腑
Long newCouponId = null;
if (prize != null && prize.trim().length() > 0) {
@@ -533,7 +531,7 @@
}
// 濂栧搧
- prize = getLotteryPrize(MAX_COUNT, list.size(), MAX_COUNT - lotteryNewbies, couponId);
+ prize = getLotteryPrize(Constant.MAX_COUNT_LOTTERY_NEWBIES, list.size(), Constant.MAX_COUNT_LOTTERY_NEWBIES - lotteryNewbies, couponId);
// 鎶戒腑
if (prize != null && prize.trim().length() > 0) {
--
Gitblit v1.8.0