From f33eaf279fdae3a5cae7775dc2a67e2d080dd5e0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 五月 2026 00:03:14 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 31638f7..a041974 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -3491,6 +3491,7 @@
// return R.ok(resultMap);
// }
// }
+// return R.fail();
@@ -3514,7 +3515,7 @@
}
baseMapper.updateById(order);
bootCommonService.setCache_orderStatus(order.getId(), order, null);
- return R.fail();
+ return R.ok();
}
/**
--
Gitblit v1.7.1