From 6663b6c22254c3583ffd113f33524524ed2dc3c4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 23 十二月 2019 14:29:11 +0800
Subject: [PATCH] 京东根据短链获取商品ID修改，返利奖励券引导页接口返回是否为VIP标识
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java | 126 +++++++++++++++++++++++++++++------------
1 files changed, 89 insertions(+), 37 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 155b530..5a3db7e 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
@@ -14,6 +14,7 @@
import org.yeshi.utils.encrypt.DESUtil;
import com.alipay.api.AlipayApiException;
+import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
@@ -21,29 +22,35 @@
import com.yeshi.fanli.entity.bus.user.LoginResult;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.TBPid;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.exception.AlipayAccountException;
-import com.yeshi.fanli.exception.AlipayTransferException;
-import com.yeshi.fanli.exception.UserAccountException;
+import com.yeshi.fanli.exception.user.AlipayAccountException;
+import com.yeshi.fanli.exception.user.AlipayTransferException;
+import com.yeshi.fanli.exception.user.UserAccountException;
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;
+import com.yeshi.fanli.service.inter.money.UserMoneyService;
+import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;
+import com.yeshi.fanli.service.inter.money.extract.ExtractService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
+import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
+import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;
+import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;
+import com.yeshi.fanli.service.inter.push.DeviceTokenXMService;
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;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
@@ -51,16 +58,16 @@
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.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserMoneyService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
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;
@@ -122,6 +129,15 @@
private DeviceTokenHWService deviceTokenHWService;
@Resource
+ private DeviceTokenOPPOService deviceTokenOPPOService;
+
+ @Resource
+ private DeviceTokenXMService deviceTokenXMService;
+
+ @Resource
+ private DeviceTokenVIVOService deviceTokenVIVOService;
+
+ @Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
@@ -141,16 +157,21 @@
@Resource
private UserAccountBindingHistoryService userAccountBindingHistoryService;
-
+
@Resource
private HomeNavbarUserService homeNavbarUserService;
-
+
@Resource
private UserInfoDeleteRecordService userInfoDeleteRecordService;
-
+
@Resource
private UserTaoLiJinOriginService userTaoLiJinOriginService;
-
+
+ @Resource
+ private UserInfoModifyRecordService userInfoModifyRecordService;
+
+ @Resource
+ private DeviceActiveService deviceActiveService;
private static final String PASSWORD_MAX_ERROR = "password_max_error";
private static final String EXTRACT_MIN_MONEY = "extract_min_money";
@@ -217,8 +238,8 @@
tbUserInfo.setTbPic(tbPortrait);
try {
- LoginResult result = userAccountService.login(request, first, system.getAppid(), code, phone, tbUserInfo,
- wxinstall, loginType);
+ LoginResult result = userAccountService.login(request, acceptData, first, system.getAppid(), code, phone,
+ tbUserInfo, wxinstall, loginType);
if (result == null)
LogHelper.error("login-result涓虹┖鍊�");
@@ -248,6 +269,13 @@
platformType = 2;
}
userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice());
+ // 缁戝畾oppo,vivo鎺ㄩ��
+ DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
+ if (active != null) {
+ deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
+ deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
+ deviceTokenXMService.bindUid(active.getId(), uuser.getId());
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -383,7 +411,10 @@
}
UserInfo user = null;
if (!StringUtil.isNullOrEmpty(code)) {
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);
+ WXAccountInfoDTO accountInfo = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());
+
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, accountInfo.getAppId(),
+ accountInfo.getAppSecret());
if (weiXinUser == null) {
out.print(JsonUtil.loadFalseResult(1, "鑾峰彇寰俊鐢ㄦ埛淇℃伅澶辫触"));
return;
@@ -636,7 +667,7 @@
}
try {
- userAccountService.changeWXBind(uid, code);
+ userAccountService.changeWXBind(acceptData, uid, code);
UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
// 鍒ゆ柇taoBaoUid鏄惁宸茬粡灏佺
ForbiddenUserIdentifyCode ic = forbiddenUserIdentifyCodeService
@@ -920,8 +951,6 @@
}
redisManager.cacheCommonString(key, "1", 120);
-
-
// 鏀粯瀹濈粦瀹�
ForbiddenUserIdentifyCode ic = forbiddenUserIdentifyCodeService
.listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.alipayAccount, account);
@@ -939,10 +968,20 @@
String[] ALIPAY_CODES = new String[] { "SYSTEM_ERROR", "PERMIT_CHECK_PERM_LIMITED", "PERM_AML_NOT_REALNAME_REV",
"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" };
+ BindingAccount oldBindingAccount = bindingAccountService.getBindingAccountByUidAndType(uid,
+ BindingAccount.TYPE_ALIPAY);
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鍏冨皢浼氬湪鍚庣画浜х敓鐨勪綑棰濅腑鍚堢悊鎵ｉ櫎锛屾暚璇风煡鏅撱��"));
+
+ userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindAlipay, account);
} catch (AlipayTransferException e1) {
if (e1.getSubCode().equalsIgnoreCase("PAYEE_NOT_EXIST")) {
String msg = "绯荤粺鏈兘鎴愬姛杞处0.1鍏冿紝鎻愮幇璐﹀彿淇℃伅鏈夎锛岃鏍稿鍚庨噸鏂板～鍐欍��";
@@ -964,7 +1003,11 @@
} catch (AlipayAccountException e3) {
// 璐︽埛鏃犱綑棰�
if (e3.getCode() == AlipayAccountException.CODE_NO_MONEY) {
- out.print(JsonUtil.loadFalseResult(5, "浣犵殑璐︽埛鐩墠娌℃湁浣欓锛屾棤闇�缁戝畾鎻愮幇璐﹀彿銆�"));
+ if (oldBindingAccount != null) {
+ out.print(JsonUtil.loadFalseResult(5, "褰撳墠璐︽埛娌℃湁浣欓锛屾棤闇�淇敼锛岃鏈変綑棰濆悗淇敼"));
+ } else {
+ out.print(JsonUtil.loadFalseResult(5, "褰撳墠璐︽埛娌℃湁浣欓锛岃鏈変綑棰濆悗缁戝畾"));
+ }
return;
// 鎻愮幇娆℃暟闄愬埗
} else if (e3.getCode() == AlipayAccountException.CODE_TIMES_LIMIT) {
@@ -1108,9 +1151,19 @@
public void logOut(AcceptData acceptData, Long uid, PrintWriter out) {
if (uid == null || uid == 0)
return;
- // 闇�瑕佽В缁慔W鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
- if ("android".equalsIgnoreCase(acceptData.getPlatform()))
+ if ("android".equalsIgnoreCase(acceptData.getPlatform())) {
+ DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
+ // 闇�瑕佽В缁慔W鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
deviceTokenHWService.unBindDeviceToken(acceptData.getDevice());
+ if (deviceActive != null) {
+ // 瑙ｇ粦OPPO鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
+ deviceTokenOPPOService.unBindUid(uid, deviceActive.getId());
+ // 瑙ｇ粦VIVO鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
+ deviceTokenVIVOService.unBindUid(uid, deviceActive.getId());
+ // 瑙ｇ粦XM鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
+ deviceTokenXMService.unBindUid(deviceActive.getId());
+ }
+ }
out.print(JsonUtil.loadTrueResult(""));
}
@@ -1146,7 +1199,7 @@
// 寰俊鐧诲綍
if (loginType == 2) {
- userInfo = userAccountService.loginWinXin(request, loginType, code, system.getAppid());
+ userInfo = userAccountService.loginWinXin(request, acceptData, loginType, code, system.getAppid());
}
if (userInfo == null) {
@@ -1166,7 +1219,7 @@
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
-
+
/* 鍚屾鏈櫥褰曚箣鍓嶈澶囨娊濂栨暟鎹� */
try {
int platformType = 0;
@@ -1180,15 +1233,14 @@
} 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();
- }
- }
+
+ // 缁戝畾oppo鎺ㄩ��
+ DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
+ if (active != null) {
+ deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
+ deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
+ deviceTokenXMService.bindUid(active.getId(), uuser.getId());
+ }
}
});
}
@@ -1302,7 +1354,7 @@
}
try {
- userAccountService.bindWeiXin(uid, code);
+ userAccountService.bindWeiXin(acceptData, uid, code);
UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
// 鍒ゆ柇taoBaoUid鏄惁宸茬粡灏佺
--
Gitblit v1.8.0