From 1e139141c1ca4124f40383f9c426da9c2c23342b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 二月 2026 16:16:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 bb9e63a..a668feb 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
@@ -19,7 +19,7 @@
@Slf4j
@RestController
-@RequestMapping("/base/v1/mini-program")
+@RequestMapping("")
@Api(tags = "系统设置模块")
public class XpSystemSettingController extends BaseController {
@@ -33,7 +33,7 @@
}
- @GetMapping("/support/phone")
+ @GetMapping("/base/v1/mini-program/support/phone")
@ApiOperation(value = "获取客服电话",tags = {"小程序首页"},response = String.class)
public AjaxResult<CustomerServicePhoneVo> getBannerList() {
Object customerServicePhone = redisService.getCacheObject(CacheConstants.CUSTOMER_SERVICE_PHONE);
@@ -52,11 +52,16 @@
// }
- @GetMapping("/support/getOrderDistance")
+ @GetMapping("/base/v1/mini-program/support/getOrderDistance")
@ApiOperation(value = "获取下单距离",tags = {"小程序首页-服务调用获取下单距离"},response = Integer.class)
public R getOrderDistance() {
return R.ok(xpSystemSettingService.getOrderDistance());
}
+ @ApiOperation(value = "获取自动结束行程时间",tags = {"小程序-业务流程"},response = Integer.class)
+ @GetMapping("/api/v1/mini-program/support/getOrderFinishTime")
+ public R<Integer> getOrderFinishTime() {
+ return R.ok(xpSystemSettingService.getOrderFinishTime());
+ }
}
--
Gitblit v1.7.1