From aa552facf6d833acab0d3e3e29bda2a0fb826ffe Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 16:14:13 +0800
Subject: [PATCH] 品牌缓存生效
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 82 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 2 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..3c46f78 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,19 +35,25 @@
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.redpack.RedPackWinNewUserService;
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;
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;
@@ -74,10 +81,25 @@
private RedPackWinInviteService redPackWinInviteService;
@Resource
+ private RedPackWinNewUserService redPackWinNewUserService;
+
+ @Resource
private UserInfoService userInfoService;
@Resource
private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private SwiperPictureService swiperPictureService;
+
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
+
+ @Resource
+ private RedPackForbidService redPackForbidService;
/**
* 缁熻
@@ -102,7 +124,7 @@
BigDecimal yesterdayUse = zero;
BigDecimal thisMonthUse = zero;
BigDecimal lastMonthUse = zero;
- BigDecimal balance = redPackBalanceService.getBalance(uid);
+ BigDecimal balance = redPackBalanceService.getBalance(uid);;
if (balance == null) {
balance = zero;
} else {
@@ -343,12 +365,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));
+ }
}
/**
@@ -364,10 +388,12 @@
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"));
data.put("shareLink", UserInviteUtil.getShareUrl(uid));
+ data.put("redPackLock", redPackForbidService.verifyForbid(uid));
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
@@ -375,10 +401,62 @@
} else {
data.put("inviteCode", "");
}
+
+ //
+ long freeCouponCount= userSystemCouponService.countUsableFreeCouponForBuy(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
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;
+ }
+ winDetail.setLogo(Constant.systemCommonConfig.getDefaultPortrait());
+ winDetail.setLogoLight(Constant.systemCommonConfig.getDefaultPortrait());
+
+ 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("redpack_win_detail_banner");
+ 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