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/v1/BanLiShopController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java
index 234ea5c..fecef80 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java
@@ -15,6 +15,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
+import com.yeshi.fanli.entity.redpack.RedPackBalance;
import com.yeshi.fanli.entity.shop.BanLiShopGoods;
import com.yeshi.fanli.entity.shop.BanLiShopGoodsSets;
import com.yeshi.fanli.entity.shop.BanLiShopGoodsSetsPay;
@@ -76,7 +77,7 @@
* @param out
*/
@RequestMapping(value = "goodsList")
- public void goodsList(AcceptData acceptData, int page, String callback, PrintWriter out) {
+ public void goodsList(AcceptData acceptData, int page,Long uid, String callback, PrintWriter out) {
if (page <= 0)
page = 1;
List<BanLiShopGoods> goodsList = banLiShopGoodsService.listGoods(null, BanLiShopGoods.STATE_ONLINE, page,
@@ -91,6 +92,14 @@
}
data.put("data", goodsList);
data.put("count", count);
+
+ RedPackBalance redPackBalance = redPackBalanceService.selectByPrimaryKey(uid);
+ if (redPackBalance != null && redPackBalance.getState() == RedPackBalance.STATE_LOCKED) {
+ data.put("redPackLock", true);
+ } else {
+ data.put("redPackLock", false);
+ }
+
if (!StringUtil.isNullOrEmpty(callback))
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
else
@@ -174,7 +183,12 @@
pay.setName(getPayName(pay.getPayType()));
}
}
- BigDecimal money = redPackBalanceService.getBalance(uid);
+ BigDecimal money = new BigDecimal(0);
+ try {
+ money = redPackBalanceService.getBalance(uid);
+ } catch (RedPackBalanceException e) {
+ e.printStackTrace();
+ }
JSONObject data = new JSONObject();
data.put("goods", goods);
data.put("hongBaoBalance", money);
--
Gitblit v1.8.0