From 4a2d0d30b1993fa4b3fdd943c93e327124c6cff7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 13:05:33 +0800
Subject: [PATCH] 测试controller修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 dc445ce..2e3ba83 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
@@ -387,15 +387,16 @@
data.put("shareLink", UserInviteUtil.getShareUrl(uid));
data.put("redPackLock", redPackForbidService.verifyForbid(uid));
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
- data.put("inviteCode", userInfoExtra.getInviteCode());
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+ if ( !StringUtil.isNullOrEmpty(inviteCode)) {
+ data.put("inviteCode", inviteCode);
} else {
data.put("inviteCode", "");
}
-
- //
- long freeCouponCount = userSystemCouponService.countUsableFreeCouponForBuy(uid);
+
+ // 璧犻�佸厤鍗曞埜
+ long freeCouponCount = userSystemCouponService.countGiveFreeCoupon(uid);
+ // 濂栧姳鍒�
long rewardCouponCount = userSystemCouponService.countUsableRewardCoupon(uid);
data.put("freeCouponCount", freeCouponCount);
--
Gitblit v1.8.0