From a97513c33f70905cf5484615d97b327d32fdc638 Mon Sep 17 00:00:00 2001
From: eric <465889110@qq.com>
Date: Tue, 30 Sep 2025 15:56:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A5=97=E9=A4=90=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sczx/order/service/impl/OrderServiceImpl.java  | 11 ++++++++++-
 .../sczx/order/thirdpart/facade/SyncFacade.java    |  3 +++
 .../order/thirdpart/integration/SyncInteg.java     | 14 +++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
index 73103b6..754f498 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -1177,7 +1177,7 @@ public class OrderServiceImpl implements OrderService {
                         .last(" limit 1");
                 OrderSubPO renBatteryOrderSubPO = orderSubRepo.getOne(querySubBatteryWrapper);
                 if(renBatteryOrderSubPO!=null){
-                    Map<String, String> result = syncInteg.sendSubOrderId(renBatteryOrderSubPO.getSuborderId());
+                    Map<String, String> result = syncInteg.sendUserMeal(renBatteryOrderSubPO.getSuborderId());
                     String status = result.get("code");
                     if (status.equals("40001") || status.equals("40002") || status.equals("40003") || status.equals("40005") || status.equals("40006")){
                         throw new BizException("此用户在租电APP还有未完成的订单，请联系用户完成租电订单或是驳回此租车订单");
@@ -1236,6 +1236,15 @@ public class OrderServiceImpl implements OrderService {
                         .set(CarPO::getBrsStatus, CarStatusEnum.RENT_ING.getCode());
                 carRepo.update(carPOLambdaUpdateWrapper);
 
+                if(renBatteryOrderSubPO!=null){
+                    Map<String, String> result = syncInteg.sendSubOrderId(renBatteryOrderSubPO.getSuborderId());
+                    String status = result.get("code");
+                    if (status.equals("40001") || status.equals("40002") || status.equals("40003") || status.equals("40005") || status.equals("40006")){
+                        throw new BizException("此用户在租电APP还有未完成的订单，请联系用户完成租电订单或是驳回此租车订单");
+                    }
+
+                }
+
 
                 return getOrderInfoByOrderNo(bindCarToOrderReq.getOrderNo());
             } catch (Exception e){
diff --git a/src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java b/src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java
index c283067..6235b40 100644
--- a/src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java
+++ b/src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java
@@ -12,4 +12,7 @@ public interface SyncFacade {
     @GetMapping("/send/subOrder/{subOrderId}")
     Map<String, String> sendSubOrderId(@PathVariable Long subOrderId);
 
+    @GetMapping("/OrderMeal/{subOrderId}")
+    Map<String, String> sendUserMeal(@PathVariable Long subOrderId);
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/sczx/order/thirdpart/integration/SyncInteg.java b/src/main/java/com/sczx/order/thirdpart/integration/SyncInteg.java
index e7d8f10..0979988 100644
--- a/src/main/java/com/sczx/order/thirdpart/integration/SyncInteg.java
+++ b/src/main/java/com/sczx/order/thirdpart/integration/SyncInteg.java
@@ -29,6 +29,18 @@ public class SyncInteg {
         return null;
     }
 
-
+    public Map<String, String> sendUserMeal(Long subOrderId){
+        try{
+            Map<String, String> result = syncFacade.sendUserMeal(subOrderId);
+            if( "200".equals(result.get("code"))){
+                return result;
+            }else{
+                return result;
+            }
+        } catch (Exception e){
+            log.error("发送租电订单查询失败",e);
+        }
+        return null;
+    }
 
 }