From b59fef5c00b15fdfdfa9d4be26e5bf6b41c75458 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 23 二月 2020 00:16:52 +0800
Subject: [PATCH] 2.0.7相关服务端功能添加
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 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..86130d4 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;
@@ -20,13 +22,13 @@
import com.yeshi.fanli.exception.money.UserMoneyDebtException;
import com.yeshi.fanli.exception.money.UserMoneyDetailException;
import com.yeshi.fanli.log.LogHelper;
-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.taobao.TaoBaoOrderService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
+import com.yeshi.fanli.service.inter.money.UserMoneyService;
+import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserMoneyService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
@@ -57,6 +59,9 @@
@Resource
private UserInfoService userInfoService;
+ @Resource
+ private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;
+
@Override
public void addUserMoneyDebt(UserMoneyDebt debt) throws UserMoneyDebtException {
if (debt == null)
@@ -77,7 +82,7 @@
UserMoneyDebt old = userMoneyDebtMapper.selectByUidAndTypeAndSourceId(debt.getUid(), debt.getType(),
debt.getSourceId());
if (old != null) {
- throw new UserMoneyDebtException(3, "瀵瑰簲缁存潈宸茬粡瀛樺湪");
+ throw new UserMoneyDebtException(3, "瀵瑰簲鍞悗宸茬粡瀛樺湪");
}
userMoneyDebtMapper.insertSelective(debt);
}
@@ -89,7 +94,7 @@
return userMoneyDebtMapper.selectByTypeAndSourceId(type, sourceId);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void repayDebt(UserMoneyDebt debt, BigDecimal money) throws UserMoneyDebtException {
if (debt == null || debt.getId() == null)
@@ -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,14 +185,29 @@
}
// 鏂扮増閫氱煡
- 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);
}
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void repayDebt(Long uid) {
// 鏌ヨ鏄惁鏈夋瑺鍊�
--
Gitblit v1.8.0