From 9c09cead959dbeef292628f345e5f80c30fc3d17 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 17:42:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java
index f138323..0d8b40b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java
@@ -9,8 +9,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import com.yeshi.fanli.dao.mybatis.AlipayAccountValidNormalHistoryMapper;
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDebtMapper;
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDebtReturnHistoryMapper;
+import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.money.UserMoneyDebt;
import com.yeshi.fanli.entity.money.UserMoneyDebt.UserMoneyDebtTypeEnum;
@@ -56,6 +58,9 @@
@Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;
@Override
public void addUserMoneyDebt(UserMoneyDebt debt) throws UserMoneyDebtException {
@@ -146,8 +151,8 @@
}
// 鏂扮増閫氱煡
- userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, weiQuanDrawBack.getOrderId(),Constant.SOURCE_TYPE_TAOBAO, money,
- userInfoService.getBalance(uid));
+ userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, weiQuanDrawBack.getOrderId(),
+ Constant.SOURCE_TYPE_TAOBAO, money, userInfoService.getBalance(uid));
break;
case HongBaoV2.TYPE_SHARE_GOODS:
@@ -158,8 +163,8 @@
weiQuanDrawBack, money);
userMoneyService.subUserMoney(uid, money, userMoneyDetail);
- userMoneyMsgNotificationService.shareOrderWeiQuan(debt.getUid(), weiQuanDrawBack.getOrderId(),Constant.SOURCE_TYPE_TAOBAO,
- money, userInfoService.getBalance(uid));
+ userMoneyMsgNotificationService.shareOrderWeiQuan(debt.getUid(), weiQuanDrawBack.getOrderId(),
+ Constant.SOURCE_TYPE_TAOBAO, money, userInfoService.getBalance(uid));
} catch (UserMoneyDetailException e) {
throw new UserMoneyDebtException(12, "鎻掑叆璧勯噾璇︽儏鍑洪敊");
@@ -180,10 +185,25 @@
}
// 鏂扮増閫氱煡
- userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, weiQuanDrawBack.getOrderId(),Constant.SOURCE_TYPE_TAOBAO, money,
- userInfoService.getBalance(uid));
+ userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, weiQuanDrawBack.getOrderId(),
+ Constant.SOURCE_TYPE_TAOBAO, money, userInfoService.getBalance(uid));
break;
}
+ } else if (debt.getType() == UserMoneyDebtTypeEnum.extractVerify) {// 鎻愮幇楠岃瘉
+ // 鏂扮増璧勯噾璁板綍
+ AlipayAccountValidNormalHistory aliPayAccountHistory = alipayAccountValidNormalHistoryMapper
+ .selectByPrimaryKey(debt.getSourceId());
+ if (aliPayAccountHistory == null)
+ return;
+ try {
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractAccountValid(aliPayAccountHistory,
+ money);
+ userMoneyService.subUserMoney(aliPayAccountHistory.getUid(), money, userMoneyDetail);
+ } catch (UserMoneyDetailException e) {
+ throw new UserMoneyDebtException(12, "鎻掑叆璧勯噾璇︽儏鍑洪敊");
+ }
+
+ userMoneyMsgNotificationService.alipayAccountValid(aliPayAccountHistory);
}
}
--
Gitblit v1.8.0