From cd4d7c2ff85d68aebec276073020224b5de56415 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 十一月 2019 10:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java |   95 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 94 insertions(+), 1 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 7fe03b9..099617e 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
@@ -26,8 +26,12 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
 import com.yeshi.fanli.entity.redpack.RedPackDetail.RedPackDetailTypeEnum;
 import com.yeshi.fanli.entity.redpack.RedPackExchange;
+import com.yeshi.fanli.entity.redpack.RedPackWinInvite;
+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.redpack.RedPackBalanceService;
@@ -35,8 +39,14 @@
 import com.yeshi.fanli.service.inter.redpack.RedPackDetailService;
 import com.yeshi.fanli.service.inter.redpack.RedPackExchangeService;
 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.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.vo.redpack.RedPackDetailVO;
+import com.yeshi.fanli.vo.redpack.RedPackWinInviteVO;
 
 import net.sf.json.JSONObject;
 
@@ -58,9 +68,19 @@
 	
 	@Resource	
 	private RedPackExchangeService redPackExchangeService;
+	
+	@Resource	
+	private RedPackWinInviteService redPackWinInviteService;
+	
+	@Resource	
+	private UserInfoService userInfoService;
+	
+	@Resource	
+	private UserInfoExtraService userInfoExtraService;
+	
 
 	/**
-	 * 缁熻娣樼ぜ閲�
+	 * 缁熻
 	 * 
 	 * @param acceptData
 	 * @param uid
@@ -278,4 +298,77 @@
 			out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
 		}
 	}
+	
+	
+	/**
+	 * 绾㈠寘閭�璇疯繘搴�
+	 * @param acceptData
+	 * @param page
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "getRewardList", method = RequestMethod.POST)
+	public void getRewardList(AcceptData acceptData, Integer page, Long uid, PrintWriter out) {
+		if (uid == null || uid <= 0) {
+			out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+			return;
+		}
+		
+		if (page == null || page < 1) {
+			out.print(JsonUtil.loadFalseResult(1, "椤电爜涓嶆纭�"));
+			return;
+		}
+		
+		List<RedPackWinInviteVO> list = new ArrayList<RedPackWinInviteVO>();
+		
+		List<RedPackWinInvite> listRecord = redPackWinInviteService.getRewardList((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);
+		if (listRecord != null && !listRecord.isEmpty()) {
+			for (RedPackWinInvite record: listRecord) {
+				UserInfo user = null;
+				RedPackWinInviteVO winVO = new RedPackWinInviteVO();
+				RedPackWinInviteTypeEnum type = record.getType();
+				if (RedPackWinInviteTypeEnum.newUserReward == type) {
+					user = userInfoService.selectByPKey(uid);
+				} else {
+					user = userInfoService.selectByPKey(record.getTeamUid());
+				}
+				winVO.setPortrait(user.getPortrait());
+				winVO.setNickName(user.getNickName());
+				winVO.setDesc(type.getDesc());
+				winVO.setMoney(record.getMoney().toString());
+				list.add(winVO);
+			}
+		}
+		
+		JSONObject data = new JSONObject();
+		data.put("count", redPackWinInviteService.countRewardRecord(uid));
+	    data.put("list", JsonUtil.getApiCommonGson().toJson(list));
+	    out.print(JsonUtil.loadTrueResult(data));		
+	}
+	
+	
+	/**
+	 * 鐢ㄦ埛鍩虹淇℃伅
+	 * @param acceptData
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "getBasicInfo", method = RequestMethod.POST)
+	public void getBasicInfo(AcceptData acceptData, Long uid, PrintWriter out) {
+		if (uid == null || uid <= 0) {
+			out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+			return;
+		}
+		
+		JSONObject data = new JSONObject();
+		data.put("balance", redPackBalanceService.getBalance(uid));
+		data.put("ruleLink", redPackConfigService.getValueByKey("invite_reward_rule_link"));
+		UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+		if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
+			data.put("inviteCode", userInfoExtra.getInviteCode());
+		} else {
+			data.put("inviteCode", "");
+		}
+	    out.print(JsonUtil.loadTrueResult(data));		
+	}
 }

--
Gitblit v1.8.0