From 07b823813e0f41c49f3468f1d2fa86b82b46689e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 13 五月 2026 09:18:00 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
index 7fa8290..d86be68 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
@@ -16,10 +16,12 @@
import com.xiaopeng.api.dto.statistics.StatisticsQueryDTO;
import com.xiaopeng.api.dto.vehicleConvoy.BaseVehicleUserDto;
import com.xiaopeng.api.feignClient.account.SysGroupMenuClient;
+import com.xiaopeng.api.feignClient.operation.XpSystemSettingClient;
import com.xiaopeng.api.feignClient.operation.XpWhiteListClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.VehicleMacClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.operation.XpOfficialPartner;
+import com.xiaopeng.api.model.operation.XpSystemSetting;
import com.xiaopeng.api.model.operation.XpWhitelist;
import com.xiaopeng.api.model.order.XpOrder;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
@@ -30,6 +32,7 @@
import com.xiaopeng.api.vo.order.*;
import com.xiaopeng.api.vo.vehicleConvoy.GetBleInfoVo;
import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.core.enums.OrderStatusEnum;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.utils.StringUtils;
import com.xiaopeng.common.core.utils.WebUtils;
@@ -54,6 +57,7 @@
import com.xiaopeng.order.model.vo.XpOrderHistoryVO;
import com.xiaopeng.order.model.vo.XpOrderPageVO;
import com.xiaopeng.order.service.IXpOrderService;
+import com.xiaopeng.order.service.impl.BootCommonService;
import com.xiaopeng.order.vo.BluetoothTokenVo;
import com.xiaopeng.order.vo.OrderDetailVo;
import com.xiaopeng.order.vo.UpdateOrderStatusVo;
@@ -119,6 +123,13 @@
@Autowired
private BluetoothDebugConfig bluetoothDebugConfig;
+
+ @Resource
+ private XpSystemSettingClient xpSystemSettingClient;
+
+ @Resource
+ @Lazy
+ private BootCommonService bootCommonService;
@@ -425,7 +436,8 @@
@XpClientCheck(checkToken = false, checkOtpToken = true)
public R<NearestNextVo> quickCapsule(@RequestParam Long startPointId,HttpServletRequest request) {
String uid = request.getHeader("XP-Uid");
- return R.ok(xpOrderService.quickCapsule(uid,startPointId));
+ NearestNextVo nearestNextVo = xpOrderService.quickCapsule(uid, startPointId);
+ return R.ok(nearestNextVo);
}
@@ -550,6 +562,19 @@
String uid = request.getHeader("XP-Uid");
try {
Boolean b = xpOrderService.endTrip(orderId, uid);
+ //判断是否测试免费
+ XpSystemSetting xpSystemSetting = xpSystemSettingClient.getSystemSettingOne().getData();
+ if (xpSystemSetting != null && xpSystemSetting.getOperateFree() == 1) {
+ //将支付金额修改成0 并将状态修改成 订单状态9
+ XpOrder xpOrder1 = new XpOrder();
+ xpOrder1.setId(orderId);
+ xpOrder1.setIsFree(true);//豁免
+ xpOrder1.setPayMoney(BigDecimal.ZERO);
+ xpOrder1.setStatus(OrderStatusEnum.PENDING_PAYMENT.getCode());
+ xpOrder1.setUpdateTime(LocalDateTime.now());
+ xpOrderService.updateById(xpOrder1);
+ bootCommonService.setCache_orderStatus(xpOrder1.getId(), xpOrder1, null);
+ }
return R.ok(b);
} catch (Exception e) {
@@ -615,9 +640,8 @@
@ApiOperation(value = "订单状态推送修改")
@PostMapping("/logan/inner/v1/order/updateOrderStatus")
public R<String> updateOrderStatus(@RequestParam Long orderId,
- @RequestParam Integer status,
- @RequestParam Boolean orderException) {
- return xpOrderService.updateOrderStatus(orderId, status, orderException);
+ @RequestParam Integer status) {
+ return xpOrderService.updateOrderStatus(orderId, status);
}
/**
--
Gitblit v1.7.1