From b63c28a0c24782753eae26892171dd1a0c8d1fe7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期日, 05 五月 2019 12:19:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
index 1a448a8..4ad0b51 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -47,6 +47,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
+import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;
import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.user.ExtractRecordService;
@@ -123,6 +124,9 @@
@Resource
private UserAccountBindingHistoryService userAccountBindingHistoryService;
+
+ @Resource
+ private UserMoneyDebtService userMoneyDebtService;
@Transactional
public Integer addExtract(Extract extract) {
@@ -506,6 +510,10 @@
Long count = hongBaoV2Mapper.countByUidAndState(uid, HongBao.STATE_YILINGQU);
if (count == null || count == 0)
throw new ExtractException(1, "娌℃湁宸插埌璐︾殑绾㈠寘");
+ // 鏌ヨ鏄惁鏈夋瑺璐�
+ boolean isDebt = userMoneyDebtService.isHaveDebtToRepay(uid);
+ if (isDebt)
+ throw new ExtractException(3, "鏈夋瑺璐︽湭杩�");
// 鑾峰彇鎵�鏈夋敹鍏ユ墍寰�
BigDecimal hongBaoMoney = hongBaoV2Service.computeMoneyByUidAndState(uid, HongBaoV2.STATE_YILINGQU);
--
Gitblit v1.8.0