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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 1444a96..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
@@ -183,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