From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java |   61 ++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 4 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 d90dc8e..39825bf 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
@@ -17,10 +17,12 @@
 import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
 import com.yeshi.fanli.entity.bus.user.DeviceLotteryRecord;
 import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
+import com.yeshi.fanli.entity.bus.user.UserLotteryRecord;
 import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
 import com.yeshi.fanli.entity.system.SystemCoupon;
 import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
 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.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemCouponService;
@@ -30,6 +32,7 @@
 import com.yeshi.fanli.service.inter.order.CommonOrderService;
 import com.yeshi.fanli.service.inter.user.DeviceLotteryRecordService;
 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.Constant;
 import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
@@ -79,6 +82,10 @@
 
 	@Resource
 	private ThreeSaleSerivce threeSaleSerivce;
+	
+	@Resource
+	private UserLotteryRecordService userLotteryRecordService;
+	
 
 
 	/**
@@ -542,11 +549,11 @@
 
 				// 宸叉娊涓殑濂栧搧
 				List<UserSystemCoupon> list = userSystemCouponService.getUserCouponBySource(uid,
-						UserSystemCoupon.SOURCE_CHOUJIANG);
+						UserSystemCoupon.SOURCE_NEWBIES);
 				
 				if (list == null || list.size() == 0) {
 					// 鎶藉
-					prize = getLotteryPrize(Constant.MAX_COUNT_LOTTERY_NEWBIES, 0, countUsed, couponType);
+					prize = getLotteryPrize(Constant.MAX_COUNT_LOTTERY_NEWBIES, countPrize , countUsed, couponType);
 					
 				} else if (list.size() == 1) {
 					UserSystemCoupon userSystemCoupon = list.get(0);
@@ -558,8 +565,11 @@
 						couponType = coupon.getType().name();
 					}
 					
+					// 鎷ユ湁濂栧搧鏁伴噺
+					countPrize = 1;
+					
 					// 鎶藉
-					prize = getLotteryPrize(Constant.MAX_COUNT_LOTTERY_NEWBIES, 0, countUsed, couponType);
+					prize = getLotteryPrize(Constant.MAX_COUNT_LOTTERY_NEWBIES, countPrize, countUsed, couponType);
 				}
 
 				// 鎶戒腑
@@ -569,7 +579,7 @@
 						prize = null;
 					} else {
 						// 鎻掑叆鍒镐俊鎭�
-						userSystemCouponService.insertUserCoupon(uid, prize, UserSystemCoupon.SOURCE_CHOUJIANG);
+						userSystemCouponService.insertUserCoupon(uid, prize, UserSystemCoupon.SOURCE_NEWBIES);
 					}
 				}
 				
@@ -640,4 +650,47 @@
 		return prize;
 	}
 
+	
+	/**
+	 * 鑾峰彇鎶藉娆℃暟- 澶╁ぉ鎶藉鍔卞埜
+	 * 
+	 * @param callback
+	 * @param acceptData
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "getDailyCount")
+	public void getDailyCount(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+		try {
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult( userLotteryRecordService.getLotteryCountDaily(uid)));
+		} catch (UserLotteryRecordException e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(),e.getMsg()));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇℃伅鑾峰彇澶辫触"));
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 鑾峰彇鎶藉缁撴灉 - 澶╁ぉ鎶藉鍔卞埜`
+	 * 
+	 * 
+	 * 
+	 * @param callback
+	 * @param acceptData
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "getDailyResult")
+	public void getDailyResult(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+		try {
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult( userLotteryRecordService.executeLotteryDaily(uid)));
+		} catch (UserLotteryRecordException e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(),e.getMsg()));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎶藉澶辫触"));
+			e.printStackTrace();
+		}
+	}
+
 }

--
Gitblit v1.8.0