From e257a2834bf7b62af5c5c96f9b0b21fac92f2196 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 24 七月 2021 18:31:02 +0800
Subject: [PATCH] jumpdetail分system
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 f3de2ef..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
@@ -259,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());
+ }
}
+
+
}
});
}
--
Gitblit v1.8.0