From a06001d130f3b088a1afbd7d7dc8616d209a9fd5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 23 五月 2019 11:23:14 +0800
Subject: [PATCH] 更换头像时 清除用户的邀请图片
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 658d29b..7afddd7 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
@@ -515,9 +515,14 @@
@Transactional
@Override
public void checkExtract(Long uid) throws ExtractException {
+ BigDecimal compensateMoney = extractMapper.computeCompensateByUid(uid);
+ if (compensateMoney == null)
+ compensateMoney = new BigDecimal(0);
+ // 涓嶅垽瀹氬埌璐︾孩鍖呴棶棰�
Long count = hongBaoV2Mapper.countByUidAndState(uid, HongBao.STATE_YILINGQU);
- if (count == null || count == 0)
+ if ((count == null || count == 0) && compensateMoney.compareTo(new BigDecimal(0)) == 0) {
throw new ExtractException(1, "娌℃湁宸插埌璐︾殑绾㈠寘");
+ }
// 鏌ヨ鏄惁鏈夋瑺璐�
boolean isDebt = userMoneyDebtService.isHaveDebtToRepay(uid);
if (isDebt)
@@ -546,10 +551,6 @@
weiqaunMoney = weiqaunMoney.abs();
BigDecimal balance = userInfoService.selectByPKey(uid).getMyHongBao();
-
- BigDecimal compensateMoney = extractMapper.computeCompensateByUid(uid);
- if (compensateMoney == null)
- compensateMoney = new BigDecimal(0);
BigDecimal after = hongBaoMoney.subtract(extractMoney.add(weiqaunMoney).add(balance).add(compensateMoney));
--
Gitblit v1.8.0