From 768d76ed8fd60091bcfb8ecfeee412f403d6f786 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 12 十一月 2019 10:05:45 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
index ea3f9c8..b3c27e0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
@@ -420,7 +420,12 @@
}
if (pay.getHongBaoPrice() != null && pay.getHongBaoPrice().compareTo(new BigDecimal(0)) > 0) {
- BigDecimal money = redPackBalanceService.getBalance(uid);
+ BigDecimal money = null;
+ try {
+ money = redPackBalanceService.getBalance(uid);
+ } catch (RedPackBalanceException e) {
+ throw new BanLiShopOrderException(25, "绾㈠寘鍔熻兘寮傚父");
+ }
if (money.compareTo(pay.getHongBaoPrice()) < 0) {
throw new BanLiShopOrderException(24, "绾㈠寘浣欓涓嶈冻");
}
--
Gitblit v1.8.0