From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java
index a0d3fe5..3355e84 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java
@@ -117,7 +117,7 @@
return bindingAccountMapper.deleteByPrimaryKey(id);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void validAlipayAccount(Long uid, String account, String name)
throws AlipayTransferException, AlipayApiException, AlipayAccountException {
@@ -135,7 +135,6 @@
"璇ユ敮浠樺疂璐﹀彿宸茶鍏朵粬璐﹀彿缁戝畾锛岃鏇存崲鍏朵粬鐨勬敮浠樺疂璐﹀彿鏉ョ粦瀹�");
}
- // TODO 鍋氶鐜囬獙璇�-姣忔湀楠岃瘉涓�娆�
AlipayAccountValidNormalHistory latest = alipayAccountValidNormalHistoryMapper.selectLatestByUid(uid);
if (latest != null) {
Calendar caLatest = Calendar.getInstance();
@@ -177,7 +176,7 @@
if (userInfo.getMyHongBao().compareTo(money) >= 0) {
// 鎵ｆ
userMoneyService.subUserMoney(uid, money, userMoneyDetail);
- userMoneyMsgNotificationService.alipayAccountValid(history);
+ userMoneyMsgNotificationService.alipayAccountValid(history,"1涓湀",latest!=null);
} else {// 浣欓涓嶈冻锛屾殏鏃朵笉鎵ｆ锛屽姞鍏ュ�熻捶鍏崇郴
UserMoneyDebt debt = new UserMoneyDebt();
debt.setCreateTime(new Date());
@@ -225,7 +224,7 @@
}
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public BindingAccount changeAlipayBindingWithVerify(Long uid, String name, String account)
throws AlipayTransferException, AlipayApiException, AlipayAccountException {
--
Gitblit v1.8.0