From e65037e672ecab852e2a6c5b242cdadfd1a58b33 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 十一月 2019 09:30:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java
index ddb7293..e5fa4b1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java
@@ -23,12 +23,12 @@
import com.yeshi.fanli.entity.redpack.RedPackDetail;
import com.yeshi.fanli.entity.redpack.RedPackDetail.RedPackDetailTypeEnum;
import com.yeshi.fanli.entity.redpack.RedPackGiveRecord;
-import com.yeshi.fanli.exception.redpack.RedPackBalanceException;
import com.yeshi.fanli.exception.redpack.RedPackGiveRecordException;
import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;
import com.yeshi.fanli.service.inter.redpack.RedPackDetailService;
+import com.yeshi.fanli.service.inter.redpack.RedPackForbidService;
import com.yeshi.fanli.service.inter.redpack.RedPackGiveRecordService;
import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.util.Constant;
@@ -60,6 +60,9 @@
@Resource
private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+ @Resource
+ private RedPackForbidService redPackForbidService;
+
@Resource(name = "producer")
private Producer producer;
@@ -118,18 +121,15 @@
if (uid == null || amount == null)
throw new RedPackGiveRecordException(1, "鍙傛暟涓嶆纭�");
+ if(redPackForbidService.verifyForbid(uid))
+ throw new RedPackGiveRecordException(1, "绾㈠寘鍔熻兘宸茶灏佺");
+
String giveMin = redPackConfigService.getValueByKey("give_money_min");
String giveMax = redPackConfigService.getValueByKey("give_money_max");
if (amount.compareTo(new BigDecimal(giveMin)) < 0 || amount.compareTo(new BigDecimal(giveMax)) > 0)
throw new RedPackGiveRecordException(1, "璧犻�侀噾棰濊嚦灏�" + giveMin + "鍏冭嚦澶�" + giveMax + "鍏�");
- BigDecimal balance = null;
- try {
- balance = redPackBalanceService.getBalance(uid);
- } catch (RedPackBalanceException e1) {
- throw new RedPackGiveRecordException(1, e1.getMsg());
- }
-
+ BigDecimal balance = redPackBalanceService.getBalance(uid);
if (balance == null || amount.compareTo(balance) > 0)
throw new RedPackGiveRecordException(1, "浣欓涓嶈冻");
--
Gitblit v1.8.0