From 100f2d185dd0dabcfb2e7a0cd81aef840324238d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 20 三月 2026 17:56:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpSystemSettingServiceImpl.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpSystemSettingServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpSystemSettingServiceImpl.java
index 099a186..a391e38 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpSystemSettingServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpSystemSettingServiceImpl.java
@@ -57,9 +57,20 @@
 
     @Override
     public void saveSystemSetting(XpSystemSetting xpSystemSetting) {
-        if (Objects.nonNull(xpSystemSetting.getId())) {
-            update(xpSystemSetting, new LambdaQueryWrapper<XpSystemSetting>().eq(XpSystemSetting::getId, xpSystemSetting.getId()));
-        } else {
+        XpSystemSetting existSetting = lambdaQuery().last("limit 1").one();
+        if (Objects.nonNull(existSetting)) {
+            lambdaUpdate().eq(XpSystemSetting::getId, existSetting.getId())
+                    .set(XpSystemSetting::getCustomerServicePhone, xpSystemSetting.getCustomerServicePhone())
+                    .set(XpSystemSetting::getOrderDistance, xpSystemSetting.getOrderDistance())
+                    .set(XpSystemSetting::getMinOrderDistance, xpSystemSetting.getMinOrderDistance())
+                    .set(XpSystemSetting::getArriveTime, xpSystemSetting.getArriveTime())
+                    .set(XpSystemSetting::getHeadShowCount, xpSystemSetting.getHeadShowCount())
+                    .set(XpSystemSetting::getNearPointDistance, xpSystemSetting.getNearPointDistance())
+                    .set(XpSystemSetting::getAdsorptionDistance, xpSystemSetting.getAdsorptionDistance())
+                    .set(XpSystemSetting::getHotfixStatus, xpSystemSetting.getHotfixStatus())
+                    .set(XpSystemSetting::getHotfixStartTime, xpSystemSetting.getHotfixStartTime())
+                    .set(XpSystemSetting::getHotfixEndTime, xpSystemSetting.getHotfixEndTime()).update();
+        }else {
             save(xpSystemSetting);
         }
         //保存热修复信息到redis

--
Gitblit v1.7.1