From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 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..70dd0ba 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());
+                            }
                         }
+
+
                     }
                 });
             }
@@ -949,7 +960,7 @@
             redisManager.clearSMSVCode(phone, SMSHistory.TYPE_REMVOE);
         }
 
-        userAccountService.forbiddenUserAll(uid, "鐢ㄦ埛涓诲姩娉ㄩ攢璐︽埛");
+        userAccountService.unRegisterUser(uid, "鐢ㄦ埛涓诲姩娉ㄩ攢璐︽埛");
         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娉ㄩ攢鎴愬姛"));
     }
 

--
Gitblit v1.8.0