From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +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 | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 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 2c3bb05..7948881 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,6 +16,8 @@
import com.xiaopeng.api.dto.statistics.StatisticsQueryDTO;
import com.xiaopeng.api.dto.vehicleConvoy.BaseVehicleUserDto;
import com.xiaopeng.api.dto.vehicleConvoy.BleInfoResponseDto;
+import com.xiaopeng.api.feignClient.account.SysGroupMenuClient;
+import com.xiaopeng.api.feignClient.frdXfipEvent.XpFrdXfipEventClient;
import com.xiaopeng.api.feignClient.operation.XpSystemSettingClient;
import com.xiaopeng.api.feignClient.operation.XpWhiteListClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.BluetoothUnlockClient;
@@ -49,6 +51,12 @@
import com.xiaopeng.order.config.BluetoothDebugConfig;
import com.xiaopeng.order.dto.OrderNavigationDto;
import com.xiaopeng.order.model.dto.*;
+import com.xiaopeng.api.model.order.OrderTrajectory;
+import com.xiaopeng.order.mangodb.service.OrderTrajectoryService;
+import com.xiaopeng.order.model.dto.XpOrderCommentDto;
+import com.xiaopeng.order.model.dto.XpOrderOperateDTO;
+import com.xiaopeng.order.model.dto.XpOrderPayDto;
+import com.xiaopeng.order.model.dto.XpOrderReassignDTO;
import com.xiaopeng.order.model.exportExcel.XpOrderExportExcel;
import com.xiaopeng.order.model.query.XpHistoryOrderListQuery;
import com.xiaopeng.order.model.query.XpOrderExcelQuery;
@@ -170,7 +178,7 @@
*/
@PostMapping("/logan/inner/order/has-unpay-order")
@ApiOperation(value = "查询是否有未支付订单", tags = {"内部接口"})
- public R<Long> hasUnPayOrder1(String uid) {
+ public R<Long> hasUnPayOrder(String uid) {
XpOrder order = xpOrderService.getOne(new LambdaQueryWrapper<XpOrder>()
.eq(XpOrder::getAppUserId, Long.parseLong(uid))
.eq(XpOrder::getStatus, 8)
@@ -1068,26 +1076,26 @@
*/
@PostMapping("/base/v1/mini-program/order/creditPayCall")
@ApiOperation(value = "信用支付下单回调", tags = {"小程序-发起支付"}, response = CreditPayCallVo.class)
- public CreditPayCallVo creditPayCall(@RequestBody CreditPayCallDto dto) {
+ public R<CreditPayCallVo> creditPayCall(@RequestBody CreditPayCallDto dto) {
CreditPayCallVo vo = new CreditPayCallVo();
vo.setRetCode("0");
vo.setRetMsg("成功");
if (dto == null || (StringUtils.isBlank(dto.getAuthOrderId()) || StringUtils.isBlank(dto.getBusinessOrderId()))) {
- return vo;
+ return R.ok(vo);
}
LambdaQueryWrapper<XpOrder> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(XpOrder::getAuthOrderId, dto.getAuthOrderId());
XpOrder order = xpOrderService.getOne(wrapper.last("LIMIT 1"));
if (order == null) {
- return vo;
+ return R.ok(vo);
}
if ("SUCCESS".equals(dto.getCreditOrderStatus())) {
// 发起扣款
xpOrderService.creditPayCall(order);
}
- return vo;
+ return R.ok(vo);
}
/**
@@ -1095,26 +1103,9 @@
*/
@PostMapping("/base/v1/mini-program/order/creditPaySuccessCall")
@ApiOperation(value = "信用扣款回调", tags = {"小程序-发起支付"}, response = CreditPayCallVo.class)
- public CreditPayCallVo creditPaySuccessCall(@RequestBody CreditPaySuccessCallDto dto) {
-
- LambdaQueryWrapper<XpOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(XpOrder::getAuthOrderId, dto.getAuthOrderId());
- XpOrder order = xpOrderService.getOne(wrapper.last("LIMIT 1"));
- if(dto.getPayStatus()==1){
- order.setStatus(9);
- order.setAppUserId(null);
- xpOrderService.updateById(order);
- CreditPayCallVo vo = new CreditPayCallVo();
- vo.setRetCode("0");
- vo.setRetMsg("成功");
-
- // 对接财务
- xpOrderService.xpFrdXfipEventPush(order,dto.getPayFee(),dto.getOrderId());
-
- return vo;
- }
- return null;
-
+ public R<CreditPayCallVo> creditPaySuccessCall(@RequestBody CreditPaySuccessCallDto dto) {
+ CreditPayCallVo vo = xpOrderService.creditPaySuccessCall(dto);
+ return R.ok(vo);
}
--
Gitblit v1.7.1