From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 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 5dfaaf7..f404daa 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
@@ -29,10 +29,12 @@
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.RedPackBalance;
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.RedPackBalanceException;
import com.yeshi.fanli.exception.redpack.RedPackExchangeException;
import com.yeshi.fanli.exception.redpack.RedPackGiveRecordException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
@@ -46,6 +48,7 @@
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;
@@ -77,8 +80,8 @@
@Resource
private RedPackWinInviteService redPackWinInviteService;
-
- @Resource
+
+ @Resource
private RedPackWinNewUserService redPackWinNewUserService;
@Resource
@@ -86,12 +89,15 @@
@Resource
private UserInfoExtraService userInfoExtraService;
-
+
@Resource
private JumpDetailV2Service jumpDetailV2Service;
-
+
@Resource
private SwiperPictureService swiperPictureService;
+
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
/**
* 缁熻
@@ -116,7 +122,14 @@
BigDecimal yesterdayUse = zero;
BigDecimal thisMonthUse = zero;
BigDecimal lastMonthUse = zero;
- BigDecimal balance = redPackBalanceService.getBalance(uid);
+ BigDecimal balance = null;
+ try {
+ balance = redPackBalanceService.getBalance(uid);
+ } catch (RedPackBalanceException e) {
+ out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
+ return;
+ }
+
if (balance == null) {
balance = zero;
} else {
@@ -380,10 +393,23 @@
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
+
JSONObject data = new JSONObject();
- data.put("balance", redPackBalanceService.getBalance(uid));
+ try {
+ data.put("balance", redPackBalanceService.getBalance(uid));
+ } catch (RedPackBalanceException e) {
+ out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
+ return;
+ }
data.put("ruleLink", redPackConfigService.getValueByKey("invite_reward_rule_link"));
data.put("shareLink", UserInviteUtil.getShareUrl(uid));
+
+ RedPackBalance redPackBalance = redPackBalanceService.selectByPrimaryKey(uid);
+ if (redPackBalance != null && redPackBalance.getState() == RedPackBalance.STATE_LOCKED) {
+ data.put("redPackLock", true);
+ } else {
+ data.put("redPackLock", false);
+ }
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
@@ -391,16 +417,23 @@
} 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
@@ -411,7 +444,7 @@
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
try {
RedPackWinDetailVO winDetail = redPackWinNewUserService.receiveReward(uid);
if (winDetail == null) {
@@ -420,7 +453,7 @@
}
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());
@@ -433,11 +466,11 @@
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));
+ out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "绾㈠寘宸茶鎶㈠厜鍟�"));
}
--
Gitblit v1.8.0