From 32063e565deaf03a0cc8abf1fafd146cc4e4d421 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 24 二月 2026 17:41:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java
index a668feb..4618132 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java
@@ -1,6 +1,5 @@
package com.xiaopeng.operation.controller;
-import com.xiaopeng.api.model.operation.SysOperLog;
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.controller.BaseController;
@@ -8,14 +7,12 @@
import com.xiaopeng.common.redis.service.RedisService;
import com.xiaopeng.operation.service.XpSystemSettingService;
import com.xiaopeng.operation.vo.CustomerServicePhoneVo;
-import com.xiaopeng.operation.vo.XpBannerListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@@ -35,7 +32,7 @@
@GetMapping("/base/v1/mini-program/support/phone")
@ApiOperation(value = "获取客服电话",tags = {"小程序首页"},response = String.class)
- public AjaxResult<CustomerServicePhoneVo> getBannerList() {
+ public AjaxResult<CustomerServicePhoneVo> getCustomerServicePhone() {
Object customerServicePhone = redisService.getCacheObject(CacheConstants.CUSTOMER_SERVICE_PHONE);
if(customerServicePhone!=null){
return success(new CustomerServicePhoneVo(customerServicePhone.toString()));
@@ -64,4 +61,14 @@
return R.ok(xpSystemSettingService.getOrderFinishTime());
}
+ @GetMapping("/base/v1/support/phone")
+ @ApiOperation(value = "获取客服电话", tags = {"运维APP-个人中心"}, response = String.class)
+ public R<CustomerServicePhoneVo> getCustomerPhone() {
+ Object customerServicePhone = redisService.getCacheObject(CacheConstants.CUSTOMER_SERVICE_PHONE);
+ if (customerServicePhone != null) {
+ return R.ok(new CustomerServicePhoneVo(customerServicePhone.toString()));
+ } else {
+ return R.ok(new CustomerServicePhoneVo(xpSystemSettingService.getCustomerServicePhone()));
+ }
+ }
}
--
Gitblit v1.7.1