From 8ce7c720e4e7a604b0ff770349b5556f39d37759 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 九月 2021 11:44:38 +0800
Subject: [PATCH] 好省呗应用兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
index 746a819..199600d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.ks.push.service.BDeviceTokenService;
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.SystemFunction;
import com.yeshi.fanli.exception.user.UserExtraTaoBaoInfoException;
@@ -20,6 +21,7 @@
import com.yeshi.fanli.util.*;
import com.yeshi.fanli.vo.taobao.TaoBaoUser;
import com.yeshi.fanli.vo.user.QQUserInfoVO;
+import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -178,6 +180,9 @@
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+ @Reference(version = "1.0", check = false)
+ private BDeviceTokenService bDeviceTokenService;
+
/**
* 鏂扮増鐧诲綍 V1.5.3
@@ -211,7 +216,8 @@
case 1: {
if (!StringUtil.isNullOrEmpty(aliAccessToken)) {
long now = System.currentTimeMillis();
- String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.oneKeyLoginCount,StringUtil.Md5( StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid()));;
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.oneKeyLoginCount, StringUtil.Md5(StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid()));
+ ;
redisManager.increase(key);
int expire = (int) ((TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now + 1000 * 60 * 60 * 24L, "yyyyMMdd"), "yyyyMMdd") - now) / 1000);
redisManager.expire(key, expire);
@@ -258,13 +264,19 @@
LogHelper.errorDetailInfo(e);
}
- // 缁戝畾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());
+ if (acceptData.getSystem().isNewPush()) {
+ bDeviceTokenService.bindUid(acceptData.getSystem().name(), StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid(), uuser.getId() + "");
+ } else {
+ // 缁戝畾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());
+ }
}
+
+
}
});
}
@@ -372,7 +384,8 @@
if (!StringUtil.isNullOrEmpty(aliAccessToken)) {
long now = System.currentTimeMillis();
- String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.oneKeyLoginCount,StringUtil.Md5( StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid()));;
+ String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.oneKeyLoginCount, StringUtil.Md5(StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid()));
+ ;
redisManager.increase(redisKey);
int expire = (int) ((TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now + 1000 * 60 * 60 * 24L, "yyyyMMdd"), "yyyyMMdd") - now) / 1000);
redisManager.expire(redisKey, expire);
@@ -625,6 +638,15 @@
return;
}
+ //鍗囬珮绾э紝闃叉娑堟伅闃熷垪鏃犳晥锛屾病鑷姩鐢宠楂樼骇
+ try {
+ userVIPPreInfoService.upgradeVipByMyOrder(uid);
+ } catch (Exception e) {
+ }
+ try {
+ userVIPPreInfoService.upgradeVipByTeamNum(uid);
+ } catch (Exception e) {
+ }
try {
userVIPInfoService.applyVIP(uid);
} catch (UserVIPInfoException e) {
--
Gitblit v1.8.0