From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 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 eb6aac1..dc445ce 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
@@ -88,10 +88,10 @@
@Resource
private SwiperPictureService swiperPictureService;
-
+
@Resource
private UserSystemCouponService userSystemCouponService;
-
+
@Resource
private RedPackForbidService redPackForbidService;
@@ -118,7 +118,8 @@
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 {
@@ -191,12 +192,9 @@
*
* @param acceptData
* @param uid
- * @param index
- * List鏈�鏈殑涓婚敭ID
- * @param year
- * 骞翠唤
- * @param month
- * 鏈堜唤
+ * @param index List鏈�鏈殑涓婚敭ID
+ * @param year 骞翠唤
+ * @param month 鏈堜唤
* @param out
*/
@RequestMapping(value = "getMoneyDetails")
@@ -379,7 +377,7 @@
@RequestMapping(value = "getBasicInfo")
public void getBasicInfo(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
if (uid == null || uid <= 0) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
@@ -395,19 +393,19 @@
} else {
data.put("inviteCode", "");
}
-
+
//
- long freeCouponCount= userSystemCouponService.countUsableFreeCouponForBuy(uid);
- long rewardCouponCount= userSystemCouponService.countUsableRewardCoupon(uid);
-
- data.put("freeCouponCount", freeCouponCount);
- data.put("rewardCouponCount", rewardCouponCount);
+ 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
+ } else {
out.print(JsonUtil.loadTrueResult(data));
+ }
}
-
}
--
Gitblit v1.8.0