From bfa07660cb22003d3fc0da73ba9f44ba79512105 Mon Sep 17 00:00:00 2001 From: eric <465889110@qq.com> Date: Sun, 7 Sep 2025 19:46:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=A7=9F=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderServiceImpl.java | 14 ++++++++ .../order/thirdpart/facade/SyncFacade.java | 15 +++++++++ .../thirdpart/integration/SyncInteg.java | 33 +++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java create mode 100644 src/main/java/com/sczx/order/thirdpart/integration/SyncInteg.java 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 cf8c912..1ab99ec 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -22,6 +22,7 @@ import com.sczx.order.thirdpart.dto.req.CarQueryConditionReq; import com.sczx.order.thirdpart.integration.CarInteg; import com.sczx.order.thirdpart.integration.PayInteg; import com.sczx.order.thirdpart.integration.StoreInteg; +import com.sczx.order.thirdpart.integration.SyncInteg; import com.sczx.order.utils.JwtUtil; import com.sczx.order.utils.OrderUtil; import com.sczx.order.utils.RedisUtil; @@ -78,6 +79,9 @@ public class OrderServiceImpl implements OrderService { @Autowired private PayService payService; + @Autowired + private SyncInteg syncInteg; + @Override public OrderMainPO queryOrderMainPoByOrderNo(String orderNo, String delFlag) { LambdaQueryWrapper currentOrderWrapper = new LambdaQueryWrapper<>(); @@ -822,6 +826,16 @@ public class OrderServiceImpl implements OrderService { .set(CarPO::getBrsStatus, CarStatusEnum.RENT_ING.getCode()); carRepo.update(carPOLambdaUpdateWrapper); + //同步租电订单 + LambdaQueryWrapper querySubBatteryWrapper = new LambdaQueryWrapper<>(); + querySubBatteryWrapper.eq(OrderSubPO::getOrderId, orderMainPO.getOrderId()) + .eq(OrderSubPO::getSuborderType, SubOrderTypeEnum.RENTBATTEY.getCode()) + .orderByDesc(OrderSubPO::getCreatedAt) + .last(" limit 1"); + OrderSubPO renBatteryOrderSubPO = orderSubRepo.getOne(queryWrapper); + Long batterySubOrderId = renBatteryOrderSubPO.getSuborderId(); + syncInteg.sendSubOrderId(batterySubOrderId); + return getOrderInfoByOrderNo(bindCarToOrderReq.getOrderNo()); } catch (Exception e){ log.warn("绑定车辆失败",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 new file mode 100644 index 0000000..30fcbf1 --- /dev/null +++ b/src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java @@ -0,0 +1,15 @@ +package com.sczx.order.thirdpart.facade; + + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@FeignClient(name = "sczx-sync", url = "${sczx-sync.ribbon.listOfServers:}") +public interface SyncFacade { + + @GetMapping("/send/subOrder") + Map sendSubOrderId(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 new file mode 100644 index 0000000..dc327b3 --- /dev/null +++ b/src/main/java/com/sczx/order/thirdpart/integration/SyncInteg.java @@ -0,0 +1,33 @@ +package com.sczx.order.thirdpart.integration; + +import com.sczx.order.exception.InnerException; +import com.sczx.order.thirdpart.facade.SyncFacade; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Slf4j +@Component +public class SyncInteg { + + @Autowired + private SyncFacade syncFacade; + + public Map sendSubOrderId(Long subOrderId){ + try{ + Map result = syncFacade.sendSubOrderId(subOrderId); + if(result.get("code") == "200"){ + return result; + } + } catch (Exception e){ + log.error("发送租电订单同步失败",e); + throw new InnerException("发送租电订单同步失败"); + } + return null; + } + + + +} From cc02ed999d39a465b2e1b5812d792d7c7ede8f7e Mon Sep 17 00:00:00 2001 From: eric <465889110@qq.com> Date: Sun, 7 Sep 2025 20:45:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1ab99ec..72669f5 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -832,7 +832,7 @@ public class OrderServiceImpl implements OrderService { .eq(OrderSubPO::getSuborderType, SubOrderTypeEnum.RENTBATTEY.getCode()) .orderByDesc(OrderSubPO::getCreatedAt) .last(" limit 1"); - OrderSubPO renBatteryOrderSubPO = orderSubRepo.getOne(queryWrapper); + OrderSubPO renBatteryOrderSubPO = orderSubRepo.getOne(querySubBatteryWrapper); Long batterySubOrderId = renBatteryOrderSubPO.getSuborderId(); syncInteg.sendSubOrderId(batterySubOrderId); From a549ace0613e3d9961d1ca16adb32b71dc313085 Mon Sep 17 00:00:00 2001 From: eric <465889110@qq.com> Date: Sun, 7 Sep 2025 21:14:19 +0800 Subject: [PATCH 3/5] no message --- src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 30fcbf1..ced8609 100644 --- a/src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java +++ b/src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java @@ -9,7 +9,7 @@ import java.util.Map; @FeignClient(name = "sczx-sync", url = "${sczx-sync.ribbon.listOfServers:}") public interface SyncFacade { - @GetMapping("/send/subOrder") + @GetMapping("/send/subOrder/") Map sendSubOrderId(Long subOrderId); } \ No newline at end of file From 2dfcb5ab4090bf3179f60a32f50daec04779994f Mon Sep 17 00:00:00 2001 From: eric <465889110@qq.com> Date: Sun, 7 Sep 2025 21:17:33 +0800 Subject: [PATCH 4/5] no message --- src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ced8609..0169f1d 100644 --- a/src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java +++ b/src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java @@ -9,7 +9,7 @@ import java.util.Map; @FeignClient(name = "sczx-sync", url = "${sczx-sync.ribbon.listOfServers:}") public interface SyncFacade { - @GetMapping("/send/subOrder/") - Map sendSubOrderId(Long subOrderId); + @GetMapping("/send/subOrder") + Map sendSubOrderId(@PathVariable Long subOrderId); } \ No newline at end of file From 4bdfa7be718b92bc705502198b496a3e97ba2d0a Mon Sep 17 00:00:00 2001 From: eric <465889110@qq.com> Date: Sun, 7 Sep 2025 21:27:39 +0800 Subject: [PATCH 5/5] no message --- src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0169f1d..c283067 100644 --- a/src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java +++ b/src/main/java/com/sczx/order/thirdpart/facade/SyncFacade.java @@ -9,7 +9,7 @@ import java.util.Map; @FeignClient(name = "sczx-sync", url = "${sczx-sync.ribbon.listOfServers:}") public interface SyncFacade { - @GetMapping("/send/subOrder") + @GetMapping("/send/subOrder/{subOrderId}") Map sendSubOrderId(@PathVariable Long subOrderId); } \ No newline at end of file