From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java
index 913473f..efff08f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java
@@ -22,15 +22,22 @@
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
+import com.yeshi.fanli.entity.bus.user.UserAccountBindingHistory;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.money.UserMoneyDebt;
+import com.yeshi.fanli.entity.money.UserMoneyDebt.UserMoneyDebtTypeEnum;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.exception.AlipayAccountException;
import com.yeshi.fanli.exception.AlipayTransferException;
import com.yeshi.fanli.exception.BindingAccountException;
+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.money.UserMoneyDebtService;
+import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.user.BindingAccountService;
-import com.yeshi.fanli.service.inter.user.UserNotificationService;
+import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;
+import com.yeshi.fanli.service.inter.user.UserMoneyService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
@@ -45,12 +52,16 @@
private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;
@Resource
private UserInfoMapper userInfoMapper;
-
@Resource
- private UserNotificationService userNotificationService;
-
+ private UserAccountBindingHistoryService userAccountBindingHistoryService;
@Resource
private UserMoneyDetailMapper userMoneyDetailMapper;
+ @Resource
+ private UserMoneyService userMoneyService;
+ @Resource
+ private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+ @Resource
+ private UserMoneyDebtService userMoneyDebtService;
public List<BindingAccount> getBindingAccountByUid(long uid) {
return bindingAccountMapper.selectByUid(uid);
@@ -135,13 +146,12 @@
UserInfo userInfo = userInfoMapper.selectByPrimaryKeyForUpdate(uid);
if (userInfo.getMyHongBao().compareTo(new BigDecimal("0")) <= 0)
- throw new AlipayAccountException(AlipayAccountException.CODE_NO_MONEY, "浣犵殑璐︽埛鐩墠娌℃湁浣欓锛屾棤闇�缁戝畾鎻愮幇甯愬彿銆�");
+ throw new AlipayAccountException(AlipayAccountException.CODE_NO_MONEY, "浣犵殑璐︽埛鏃犱綑棰濓紝鏃犻渶缁戝畾鎻愮幇甯愬彿銆�");
// 闇�瑕佽浆璐﹂獙璇�
BigDecimal money = new BigDecimal("0.1");
transferAlipayWithVerify(account, name);
- // 鎵ｆ
- userInfoMapper.subHongBaoByUid(uid, money);
+
// 杞处鎴愬姛
// 鎻掑叆杞处鎴愬姛琛�
AlipayAccountValidNormalHistory history = new AlipayAccountValidNormalHistory();
@@ -150,10 +160,10 @@
history.setName(name);
history.setUid(uid);
alipayAccountValidNormalHistoryMapper.insertSelective(history);
+ UserMoneyDetail userMoneyDetail = null;
// 鏂扮増璧勯噾
try {
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractAccountValid(history, money);
- userMoneyDetailMapper.insert(userMoneyDetail);
+ userMoneyDetail = UserMoneyDetailFactory.createExtractAccountValid(history, money);
} catch (UserMoneyDetailException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -162,7 +172,26 @@
}
}
- userNotificationService.alipayAccountValidRight(uid, money, account);
+ // 浣欓鍏呰冻
+ if (userInfo.getMyHongBao().compareTo(money) >= 0) {
+ // 鎵ｆ
+ userMoneyService.subUserMoney(uid, money, userMoneyDetail);
+ userMoneyMsgNotificationService.alipayAccountValid(history);
+ } else {// 浣欓涓嶈冻锛屾殏鏃朵笉鎵ｆ锛屽姞鍏ュ�熻捶鍏崇郴
+ UserMoneyDebt debt = new UserMoneyDebt();
+ debt.setCreateTime(new Date());
+ debt.setLeftMoney(money);
+ debt.setOriginMoney(money);
+ debt.setSourceId(history.getId());
+ debt.setType(UserMoneyDebtTypeEnum.extractVerify);
+ debt.setUid(uid);
+ try {
+ userMoneyDebtService.addUserMoneyDebt(debt);
+ } catch (UserMoneyDebtException e) {
+ LogHelper.errorDetailInfo(e, "楠岃瘉ID锛�" + history.getId(), "");
+ }
+
+ }
}
@@ -199,6 +228,17 @@
@Override
public BindingAccount changeAlipayBindingWithVerify(Long uid, String name, String account)
throws AlipayTransferException, AlipayApiException, AlipayAccountException {
+ BindingAccount bindingAccount = bindingAccountMapper.selectByUidAndType(uid, BindingAccount.TYPE_ALIPAY);
+ if (bindingAccount != null) {
+ // 楠岃瘉鏄惁7澶╁唴鏇存崲浜嗘墜鏈哄彿
+ UserAccountBindingHistory history = userAccountBindingHistoryService.getLatestHistory(uid,
+ UserAccountBindingHistory.TYPE_PHONE);
+ // 鎵嬫満鍙锋洿鎹㈢粦瀹氱殑7澶╁唴涓嶈兘鎻愮幇
+ if (history != null && !history.getFirst()
+ && (System.currentTimeMillis() - history.getCreateTime().getTime()) < 1000 * 60 * 60 * 24 * 7L) {
+ throw new AlipayAccountException(111, "淇敼鎵嬫満鍙�7澶╁唴涓嶅厑璁镐慨鏀规敮浠樺疂璐﹀彿");
+ }
+ }
try {
validAlipayAccount(uid, account, name);
@@ -210,7 +250,6 @@
throw new AlipayAccountException(e1.getCode(), e1.getMsg());
}
- BindingAccount bindingAccount = bindingAccountMapper.selectByUidAndType(uid, BindingAccount.TYPE_ALIPAY);
if (bindingAccount == null)// 鍒涘缓璐﹀彿
{
bindingAccount = new BindingAccount();
--
Gitblit v1.8.0