From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:18:11 +0800
Subject: [PATCH] 订单补贴消息修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java |   52 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
index e652eaa..2e3ba83 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
@@ -34,14 +34,18 @@
 import com.yeshi.fanli.entity.redpack.RedPackWinInvite.RedPackWinInviteTypeEnum;
 import com.yeshi.fanli.exception.redpack.RedPackExchangeException;
 import com.yeshi.fanli.exception.redpack.RedPackGiveRecordException;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
+import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
 import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
 import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;
 import com.yeshi.fanli.service.inter.redpack.RedPackDetailService;
 import com.yeshi.fanli.service.inter.redpack.RedPackExchangeService;
+import com.yeshi.fanli.service.inter.redpack.RedPackForbidService;
 import com.yeshi.fanli.service.inter.redpack.RedPackGiveRecordService;
 import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
@@ -79,6 +83,18 @@
 	@Resource
 	private UserInfoExtraService userInfoExtraService;
 
+	@Resource
+	private JumpDetailV2Service jumpDetailV2Service;
+
+	@Resource
+	private SwiperPictureService swiperPictureService;
+
+	@Resource
+	private UserSystemCouponService userSystemCouponService;
+
+	@Resource
+	private RedPackForbidService redPackForbidService;
+
 	/**
 	 * 缁熻
 	 * 
@@ -103,6 +119,7 @@
 		BigDecimal thisMonthUse = zero;
 		BigDecimal lastMonthUse = zero;
 		BigDecimal balance = redPackBalanceService.getBalance(uid);
+		;
 		if (balance == null) {
 			balance = zero;
 		} else {
@@ -175,12 +192,9 @@
 	 * 
 	 * @param acceptData
 	 * @param uid
-	 * @param index
-	 *            List鏈�鏈殑涓婚敭ID
-	 * @param year
-	 *            骞翠唤
-	 * @param month
-	 *            鏈堜唤
+	 * @param index      List鏈�鏈殑涓婚敭ID
+	 * @param year       骞翠唤
+	 * @param month      鏈堜唤
 	 * @param out
 	 */
 	@RequestMapping(value = "getMoneyDetails")
@@ -343,12 +357,14 @@
 		}
 
 		JSONObject data = new JSONObject();
+		data.put("winMoney", redPackWinInviteService.getRewardMoney(uid).setScale(2));
 		data.put("count", redPackWinInviteService.countRewardRecord(uid));
 		data.put("list", JsonUtil.getApiCommonGson().toJson(list));
 		if (!StringUtil.isNullOrEmpty(callback)) {
 			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-		} else
+		} else {
 			out.print(JsonUtil.loadTrueResult(data));
+		}
 	}
 
 	/**
@@ -361,24 +377,36 @@
 	@RequestMapping(value = "getBasicInfo")
 	public void getBasicInfo(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
 		if (uid == null || uid <= 0) {
-			out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
 			return;
 		}
+
 		JSONObject data = new JSONObject();
 		data.put("balance", redPackBalanceService.getBalance(uid));
 		data.put("ruleLink", redPackConfigService.getValueByKey("invite_reward_rule_link"));
 		data.put("shareLink", UserInviteUtil.getShareUrl(uid));
+		data.put("redPackLock", redPackForbidService.verifyForbid(uid));
 
-		UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
-		if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
-			data.put("inviteCode", userInfoExtra.getInviteCode());
+		String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+		if ( !StringUtil.isNullOrEmpty(inviteCode)) {
+			data.put("inviteCode", inviteCode);
 		} else {
 			data.put("inviteCode", "");
 		}
+		
+		// 璧犻�佸厤鍗曞埜
+		long freeCouponCount = userSystemCouponService.countGiveFreeCoupon(uid);
+		// 濂栧姳鍒�
+		long rewardCouponCount = userSystemCouponService.countUsableRewardCoupon(uid);
+
+		data.put("freeCouponCount", freeCouponCount);
+		data.put("rewardCouponCount", rewardCouponCount);
 
 		if (!StringUtil.isNullOrEmpty(callback)) {
 			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-		} else
+		} else {
 			out.print(JsonUtil.loadTrueResult(data));
+		}
 	}
+
 }

--
Gitblit v1.8.0