From f2c91f920851153695d29ab047328801974cd459 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 26 二月 2019 16:20:10 +0800
Subject: [PATCH] 券相关使用调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 b782423..7010778 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
@@ -26,19 +26,24 @@
import com.yeshi.fanli.dao.mybatis.AlipayAccountValidNormalHistoryMapper;
import com.yeshi.fanli.dao.mybatis.BindingAccountMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
+import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
import com.yeshi.fanli.dao.user.BindingAccountDao;
import com.yeshi.fanli.entity.bus.user.AccountDetails;
import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+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.UserMoneyDetailException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.AccountDetailsFactory;
+import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import net.sf.json.JSONObject;
@@ -57,6 +62,9 @@
private AccountDetailsMapper accountDetailsMapper;
@Resource
private UserNotificationService userNotificationService;
+
+ @Resource
+ private UserMoneyDetailMapper userMoneyDetailMapper;
public List<BindingAccount> getBindingAccountByUid(long uid) {
return bindingAccountDao.list("from BindingAccount ba where ba.userInfo.id=?", new Serializable[] { uid });
@@ -153,7 +161,7 @@
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");
@@ -172,6 +180,19 @@
AccountDetails accountDetails = AccountDetailsFactory.create("-" + money.toString(),
AccountDetailsFactory.VALID_ALIPAY_ACCOUNT, null, null, new UserInfo(uid));
accountDetailsMapper.insertSelective(accountDetails);
+ // 鏂扮増璧勯噾
+ try {
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractAccountValid(history, money);
+ userMoneyDetail.setId(accountDetails.getId());
+ userMoneyDetailMapper.insert(userMoneyDetail);
+ } catch (UserMoneyDetailException e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+
userNotificationService.alipayAccountValidRight(uid, money, account);
}
@@ -246,7 +267,7 @@
public boolean canVerifyAlipayAccount(Long uid) throws BindingAccountException {
UserInfo userInfo = userInfoMapper.selectByPrimaryKeyForUpdate(uid);
if (userInfo.getMyHongBao().compareTo(new BigDecimal("0")) <= 0)
- throw new BindingAccountException(1, "璐︽埛鏃犱綑棰�");
+ throw new BindingAccountException(1, "浣犵殑璐︽埛鐩墠娌℃湁浣欓锛屾棤闇�缁戝畾鎻愮幇甯愬彿銆�");
AlipayAccountValidNormalHistory latest = alipayAccountValidNormalHistoryMapper.selectLatestByUid(uid);
if (latest != null) {
@@ -254,7 +275,7 @@
caLatest.setTimeInMillis(latest.getCreateTime().getTime());
Calendar nowLatest = Calendar.getInstance();
if (caLatest.get(Calendar.MONTH) == nowLatest.get(Calendar.MONTH))// 涓婃鏇存敼鍜岀幇鍦ㄦ槸鍚屼竴涓湀
- throw new BindingAccountException(2, "鏈湀鏀粯瀹濈粦瀹氭鏁拌秴闄�");
+ throw new BindingAccountException(2, "姣忔湀浠呭彲淇敼1娆℃彁鐜拌处鍙凤紝璇蜂笅鏈堝啀璇曞惂銆�");
}
return true;
}
--
Gitblit v1.8.0