From 0f3fc66c7e2b234411e2f1b35671e7a547cdfd44 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 21 八月 2019 13:14:54 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java | 77 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
index 2027544..f79cd4d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
@@ -33,6 +33,7 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
@@ -40,6 +41,7 @@
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
+import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
@@ -48,6 +50,7 @@
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
+import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
@@ -57,6 +60,7 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
@@ -137,6 +141,15 @@
@Resource
private UserAccountBindingHistoryService userAccountBindingHistoryService;
+
+ @Resource
+ private HomeNavbarUserService homeNavbarUserService;
+
+ @Resource
+ private UserInfoDeleteRecordService userInfoDeleteRecordService;
+
+ @Resource
+ private UserTaoLiJinOriginService userTaoLiJinOriginService;
private static final String PASSWORD_MAX_ERROR = "password_max_error";
private static final String EXTRACT_MIN_MONEY = "extract_min_money";
@@ -463,10 +476,7 @@
// 灏佺鐢ㄦ埛
// 灏佺缁戝畾鐨勬甯哥敤鎴�
if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {
- UserInfo update = new UserInfo(uid);
- update.setState(UserInfo.STATE_FORBIDDEN);
- update.setStateDesc("缁戝畾琚皝绂佺殑鐢佃瘽鍙风爜琚皝绂�");
- userInfoService.updateByPrimaryKeySelective(update);
+ userAccountService.forbiddenUser(uid, "灏佺锛氱粦瀹氳灏佺鐨勭數璇濆彿鐮�");
}
return;
}
@@ -564,10 +574,7 @@
// 灏佺鐢ㄦ埛
// 灏佺缁戝畾鐨勬甯哥敤鎴�
if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {
- UserInfo update = new UserInfo(uid);
- update.setState(UserInfo.STATE_FORBIDDEN);
- update.setStateDesc("缁戝畾琚皝绂佺殑娣樺疂鍙疯灏佺");
- userInfoService.updateByPrimaryKeySelective(update);
+ userAccountService.forbiddenUser(uid, "灏佺锛氱粦瀹氳灏佺鐨勬窐瀹濆彿");
}
return;
}
@@ -638,10 +645,7 @@
// 灏佺鐢ㄦ埛
// 灏佺缁戝畾鐨勬甯哥敤鎴�
if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {
- UserInfo update = new UserInfo(uid);
- update.setState(UserInfo.STATE_FORBIDDEN);
- update.setStateDesc("缁戝畾琚皝绂佺殑寰俊鍙疯灏佺");
- userInfoService.updateByPrimaryKeySelective(update);
+ userAccountService.forbiddenUser(uid, "灏佺锛氱粦瀹氳灏佺鐨勫井淇″彿");
}
return;
}
@@ -915,8 +919,6 @@
}
redisManager.cacheCommonString(key, "1", 120);
-
-
// 鏀粯瀹濈粦瀹�
ForbiddenUserIdentifyCode ic = forbiddenUserIdentifyCodeService
.listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.alipayAccount, account);
@@ -925,10 +927,7 @@
// 灏佺鐢ㄦ埛
// 灏佺缁戝畾鐨勬甯哥敤鎴�
if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {
- UserInfo update = new UserInfo(uid);
- update.setState(UserInfo.STATE_FORBIDDEN);
- update.setStateDesc("缁戝畾琚皝绂佺殑鏀粯瀹濊灏佺");
- userInfoService.updateByPrimaryKeySelective(update);
+ userAccountService.forbiddenUser(uid, "灏佺锛氱粦瀹氳灏佺鐨勬敮浠樺疂");
}
return;
}
@@ -938,9 +937,15 @@
"PERM_AML_NOT_REALNAME_REV", "PAYEE_USER_INFO_ERROR", "PAYEE_ACC_OCUPIED",
"PERMIT_CHECK_PERM_IDENTITY_THEFT", "PERMIT_NON_BANK_LIMIT_PAYEE", "EXCEED_LIMIT_UNRN_DM_AMOUNT" };
try {
+ BigDecimal balance = user.getMyHongBao();
BindingAccount bindingAccount = bindingAccountService.changeAlipayBindingWithVerify(uid, name, account);
- out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),
- "绯荤粺宸叉垚鍔熻浆璐�0.1鍏冨埌鎻愮幇璐﹀彿涓紝鎻愮幇璐﹀彿楠岃瘉閫氳繃锛屾伃鍠滀綘锛佸彲浠ユ彁鐜颁簡銆�"));
+ // 浣欓鍏呰冻
+ if (balance.compareTo(new BigDecimal("0.1")) >= 0)
+ out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),
+ "绯荤粺宸叉垚鍔熻浆璐�0.1鍏冨埌鎻愮幇璐﹀彿涓紝鎻愮幇璐﹀彿楠岃瘉閫氳繃锛屾伃鍠滀綘锛佸彲浠ユ彁鐜颁簡銆�"));
+ else
+ out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),
+ "绯荤粺宸叉垚鍔熻浆璐�0.1鍏冨埌鎻愮幇璐﹀彿涓紝鎻愮幇璐﹀彿楠岃瘉閫氳繃锛屾伃鍠滀綘锛佸彲浠ユ彁鐜颁簡銆傛敞锛氭0.1鍏冨皢浼氬湪鍚庣画浜х敓鐨勪綑棰濅腑鍚堢悊鎵ｉ櫎锛屾暚璇风煡鏅撱��"));
} catch (AlipayTransferException e1) {
if (e1.getSubCode().equalsIgnoreCase("PAYEE_NOT_EXIST")) {
String msg = "绯荤粺鏈兘鎴愬姛杞处0.1鍏冿紝鎻愮幇璐﹀彿淇℃伅鏈夎锛岃鏍稿鍚庨噸鏂板～鍐欍��";
@@ -1157,8 +1162,16 @@
final UserInfo uuser = userInfo;
ThreadUtil.run(new Runnable() {
public void run() {
+ String device = acceptData.getDevice();
try {
- /* 鍚屾鏈櫥褰曚箣鍓嶈澶囨娊濂栨暟鎹� */
+ // 鍚屾鑷畾涔夊鑸�
+ homeNavbarUserService.synchroDeviceToUser(uuser.getId(), device);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+
+ /* 鍚屾鏈櫥褰曚箣鍓嶈澶囨娊濂栨暟鎹� */
+ try {
int platformType = 0;
String platform = acceptData.getPlatform();
if ("android".equals(platform)) {
@@ -1166,10 +1179,18 @@
} else if ("ios".equals(platform)) {
platformType = 2;
}
- userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType,
- acceptData.getDevice());
+ userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, device);
} catch (Exception e) {
e.printStackTrace();
+ }
+
+ if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
+ /* 鏂颁汉绾㈠寘 */
+ try {
+ userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), device);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
});
@@ -1244,10 +1265,7 @@
// 灏佺鐢ㄦ埛
// 灏佺缁戝畾鐨勬甯哥敤鎴�
if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {
- UserInfo update = new UserInfo(uid);
- update.setState(UserInfo.STATE_FORBIDDEN);
- update.setStateDesc("缁戝畾琚皝绂佺殑鐢佃瘽鍙风爜琚皝绂�");
- userInfoService.updateByPrimaryKeySelective(update);
+ userAccountService.forbiddenUser(uid, "灏佺锛氱粦瀹氳灏佺鐨勭數璇濆彿鐮�");
}
return;
}
@@ -1298,10 +1316,7 @@
// 灏佺鐢ㄦ埛
// 灏佺缁戝畾鐨勬甯哥敤鎴�
if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {
- UserInfo update = new UserInfo(uid);
- update.setState(UserInfo.STATE_FORBIDDEN);
- update.setStateDesc("缁戝畾琚皝绂佺殑寰俊鍙疯灏佺");
- userInfoService.updateByPrimaryKeySelective(update);
+ userAccountService.forbiddenUser(uid, "灏佺锛氱粦瀹氳灏佺鐨勫井淇″彿");
}
return;
}
--
Gitblit v1.8.0