From bbdd5f4f286fc593c5c30bd1bccd1f39af135dfa Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 三月 2026 09:43:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java
index 47eabda..bdb460e 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java
@@ -1,9 +1,8 @@
package com.xiaopeng.operation.controller;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.xiaopeng.api.dto.account.UserResourcesDto;
+import com.xiaopeng.api.dto.account.UcUserInfo;
import com.xiaopeng.api.dto.map.RouteAndFareDto;
import com.xiaopeng.api.dto.operation.LonLatDto;
import com.xiaopeng.api.feignClient.account.UserResourcesClient;
@@ -114,14 +113,13 @@
@XpClientCheck(checkToken = false, checkOtpToken = true)
public R<Boolean> isInWhiteList(HttpServletRequest request) {
String uid = request.getHeader("XP-Uid");
- UserResourcesDto baseUserByUid = userResourcesClient.getBaseUserByUid(uid);
- if (baseUserByUid!=null) {
+ UcUserInfo baseUserByUid = userResourcesClient.getBaseUserByUid(uid);
+ if (baseUserByUid != null) {
try {
- Object data = baseUserByUid.getData();
- String phone = JSONObject.parseObject(data.toString()).getString("mobile");
+ String phone = baseUserByUid.getMobile();
long count = xpWhitelistService.count(new LambdaQueryWrapper<XpWhitelist>().eq(XpWhitelist::getAccount, phone).eq(XpWhitelist::getStatus, 1));
- return R.ok(count>0);
- }catch (Exception e){
+ return R.ok(count > 0);
+ } catch (Exception e) {
log.error("获取用户信息失败: {}", e.getMessage());
return R.ok(false);
}
--
Gitblit v1.7.1