From 4d7db6fd66f5b2c9cae9954e46314f9711ce1e8f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 十一月 2019 18:51:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java |   61 ++++++++++++++++++++++++++++++
 1 files changed, 60 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 e652eaa..f9acd8b 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,6 +26,7 @@
 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.homemodule.SwiperPicture;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
 import com.yeshi.fanli.entity.redpack.RedPackDetail.RedPackDetailTypeEnum;
@@ -34,12 +35,15 @@
 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.RedPackGiveRecordService;
 import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;
+import com.yeshi.fanli.service.inter.redpack.RedPackWinNewUserService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.util.Constant;
@@ -47,6 +51,7 @@
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.UserInviteUtil;
 import com.yeshi.fanli.vo.redpack.RedPackDetailVO;
+import com.yeshi.fanli.vo.redpack.RedPackWinDetailVO;
 import com.yeshi.fanli.vo.redpack.RedPackWinInviteVO;
 
 import net.sf.json.JSONObject;
@@ -72,12 +77,21 @@
 
 	@Resource
 	private RedPackWinInviteService redPackWinInviteService;
+	
+	@Resource	
+	private RedPackWinNewUserService redPackWinNewUserService;
 
 	@Resource
 	private UserInfoService userInfoService;
 
 	@Resource
 	private UserInfoExtraService userInfoExtraService;
+	
+	@Resource
+	private JumpDetailV2Service jumpDetailV2Service;
+	
+	@Resource
+	private SwiperPictureService swiperPictureService;
 
 	/**
 	 * 缁熻
@@ -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));
+		}
 	}
 
 	/**
@@ -381,4 +397,47 @@
 		} else
 			out.print(JsonUtil.loadTrueResult(data));
 	}
+	
+	
+	/**
+	 * 鏂颁汉绾㈠寘璇︽儏
+	 * @param acceptData
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "getWinDetail", method = RequestMethod.POST)
+	public void getWinDetail(AcceptData acceptData, Long uid, PrintWriter out) {
+		if (uid == null || uid <= 0) {
+			out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+			return;
+		}
+		
+		try {
+			RedPackWinDetailVO winDetail = redPackWinNewUserService.receiveReward(uid);
+			if (winDetail == null) {
+				out.print(JsonUtil.loadFalseResult(1, "绾㈠寘宸茶鎶㈠厜"));
+				return;
+			}
+			
+			JSONObject params = new JSONObject();
+			params.put("url", redPackConfigService.getValueByKey("goods_shop_link_h5"));
+			winDetail.setParams(params.toString());
+			winDetail.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",
+					Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
+			winDetail.setTips(redPackConfigService.getValueByKey("new_user_win_tips"));
+
+			// 2銆侀《閮ㄨ疆鎾浘
+			List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("index_top");
+			List<SwiperPicture> topPicList = new ArrayList<>();
+			if (oldtopPicList != null && oldtopPicList.size() > 0)
+				topPicList.addAll(oldtopPicList);
+			
+			JSONObject data = new JSONObject();
+			data.put("detail", JsonUtil.getApiCommonGson().toJson(winDetail));
+			data.put("banner", JsonUtil.getApiCommonGson().toJson(topPicList));
+		    out.print(JsonUtil.loadTrueResult(data));		
+		} catch (Exception e) {
+			out.print(JsonUtil.loadFalseResult(1, "绾㈠寘宸茶鎶㈠厜鍟�"));
+		}
+	}
 }

--
Gitblit v1.8.0