From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 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 4864793..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
@@ -34,6 +34,7 @@
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;
@@ -47,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;
@@ -93,6 +95,9 @@
@Resource
private SwiperPictureService swiperPictureService;
+
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
/**
* 缁熻
@@ -117,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 {
@@ -383,7 +395,12 @@
}
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));
@@ -400,6 +417,13 @@
} 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)));
--
Gitblit v1.8.0