From 2b71bd05caf230bf9d35e0f000cea6d0413a774e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 01 十一月 2019 11:39:45 +0800
Subject: [PATCH] 邀请奖励红包
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 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..0179e53 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,11 @@
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.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 +38,12 @@
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.UserInfoService;
+import com.yeshi.fanli.util.Constant;
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 +65,16 @@
@Resource
private RedPackExchangeService redPackExchangeService;
+
+ @Resource
+ private RedPackWinInviteService redPackWinInviteService;
+
+ @Resource
+ private UserInfoService userInfoService;
+
/**
- * 缁熻娣樼ぜ閲�
+ * 缁熻
*
* @param acceptData
* @param uid
@@ -278,4 +292,45 @@
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
}
+
+
+
+ @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));
+ }
}
--
Gitblit v1.8.0