From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 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..385a32e 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,7 +60,9 @@
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.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.wx.WXLoginUtil;
import net.sf.json.JSONObject;
@@ -137,6 +142,16 @@
@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 +478,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 +576,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 +647,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;
}
@@ -925,10 +931,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;
}
@@ -1157,8 +1160,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,11 +1177,19 @@
} 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 +1263,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 +1314,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