From 7b2202cbaadf70983f1bfe147a9910d0f37840f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 15 四月 2019 17:27:08 +0800
Subject: [PATCH] 天天抽奖代码优化

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserLotteryRecordServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserLotteryRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserLotteryRecordServiceImpl.java
index 372cff1..594ce39 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserLotteryRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserLotteryRecordServiceImpl.java
@@ -19,11 +19,13 @@
 import com.yeshi.fanli.exception.user.UserInfoExtraException;
 import com.yeshi.fanli.exception.user.UserLotteryRecordException;
 import com.yeshi.fanli.exception.user.UserSystemCouponException;
+import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemCouponService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.UserLotteryRecordService;
 import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.util.StringUtil;
 
 import net.sf.json.JSONObject;
 
@@ -313,13 +315,14 @@
 			throw new UserLotteryRecordException(2,  "鎶藉娆℃暟涓嶈冻");
 		} 
 		
-		String prize = "";
+		String prize = null;
 		// 浠婃棩澶╁ぉ鎶藉-宸叉娊涓嫢鏈夊埜鏁伴噺
 		int todayHas = userSystemCouponService.countTodatyUserCouponBySource(uid, UserSystemCoupon.SOURCE_DAILY_REBATE);
 		
 		if (todayHas == 0) {
 			// 鎶藉
 			prize = getLotteryPrizeDaily(count);
+			LogHelper.test(uid + "涓缁撴灉锛�" + prize);
 			try {
 				int num = 0;
 				if ("rebateCoupon".equals(prize)) {
@@ -327,8 +330,11 @@
 				} else if ("doubleCoupon".equals(prize)) {
 					num = 2;
 				} 
+				
 				// 鎻掑叆濂栧姳鍒�
-				userSystemCouponService.randomRewardCoupon(num, uid, UserSystemCoupon.SOURCE_DAILY_REBATE);
+				if (num > 0) {
+					userSystemCouponService.randomRewardCoupon(num, uid, UserSystemCoupon.SOURCE_DAILY_REBATE);
+				}
 				
 			} catch (UserSystemCouponException e) {
 				throw new UserLotteryRecordException(1, "鎶藉澶辫触");
@@ -345,9 +351,11 @@
 		updateRecord.setUpdateTime(new Date());
 		userLotteryRecordMapper.updateByPrimaryKeySelective(updateRecord);
 		
-		if (prize == null || prize.trim().length() == 0) {
+		LogHelper.test(uid + "杩斿洖H5涓缁撴灉锛�" + prize);
+		if (StringUtil.isNullOrEmpty(prize)) {
 			prize = "NoPrize";
 		}
+		LogHelper.test(uid + "杩斿洖H5涓缁撴灉澶勭悊绌哄�硷細" + prize);
 		
 		Map<String,Object> map = new HashMap<String, Object>();
 		map.put("count", count);
@@ -379,7 +387,7 @@
 			}
 		} else {
 			long result = (1 + Math.round(Math.random() * (9)));
-			if (result <= 2) {
+			if (result <= 3) {
 				prize = rebateCoupon;
 			} else if (result <= 5) {
 				prize = doubleCoupon; 

--
Gitblit v1.8.0