From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 967335b..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
@@ -40,6 +40,7 @@
import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import net.sf.json.JSONObject;
@@ -116,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 {
@@ -134,7 +135,6 @@
"璇ユ敮浠樺疂璐﹀彿宸茶鍏朵粬璐﹀彿缁戝畾锛岃鏇存崲鍏朵粬鐨勬敮浠樺疂璐﹀彿鏉ョ粦瀹�");
}
- // TODO 鍋氶鐜囬獙璇�-姣忔湀楠岃瘉涓�娆�
AlipayAccountValidNormalHistory latest = alipayAccountValidNormalHistoryMapper.selectLatestByUid(uid);
if (latest != null) {
Calendar caLatest = Calendar.getInstance();
@@ -176,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());
@@ -224,7 +224,7 @@
}
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public BindingAccount changeAlipayBindingWithVerify(Long uid, String name, String account)
throws AlipayTransferException, AlipayApiException, AlipayAccountException {
@@ -236,7 +236,7 @@
// 鎵嬫満鍙锋洿鎹㈢粦瀹氱殑7澶╁唴涓嶈兘鎻愮幇
if (history != null && !history.getFirst()
&& (System.currentTimeMillis() - history.getCreateTime().getTime()) < 1000 * 60 * 60 * 24 * 7L) {
- throw new AlipayAccountException(111, "淇敼鎵嬫満鍙�7澶╁唴涓嶅厑璁镐慨鏀规敮浠樺疂璐﹀彿");
+ throw new AlipayAccountException(111, "淇敼鎵嬫満鍙峰悗锛�7澶╁唴鏃犳硶鏇存崲鎻愮幇璐﹀彿");
}
}
@@ -283,10 +283,8 @@
}
AlipayAccountValidNormalHistory latest = alipayAccountValidNormalHistoryMapper.selectLatestByUid(uid);
if (latest != null) {
- Calendar caLatest = Calendar.getInstance();
- caLatest.setTimeInMillis(latest.getCreateTime().getTime());
- Calendar nowLatest = Calendar.getInstance();
- if (caLatest.get(Calendar.MONTH) == nowLatest.get(Calendar.MONTH))// 涓婃鏇存敼鍜岀幇鍦ㄦ槸鍚屼竴涓湀
+ if (TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM")
+ .equalsIgnoreCase(TimeUtil.getGernalTime(latest.getCreateTime().getTime(), "yyyy-MM")))// 涓婃鏇存敼鍜岀幇鍦ㄦ槸鍚屼竴骞村悓涓�涓湀
throw new BindingAccountException(2, "姣忔湀浠呭彲淇敼1娆℃彁鐜拌处鍙凤紝璇蜂笅鏈堝啀璇曞惂銆�");
}
return true;
--
Gitblit v1.8.0