From ad5a5abb31f0eb4608a1deb427169b9d39cdaf56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 10 Feb 2026 12:08:58 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E6=8C=87=E6=B4=BE=E9=85=8D=E9=80=81=E5=91=98=E6=97=B6?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=95=86=E5=9F=8E=E8=AE=A2=E5=8D=95=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=8A=B6=E6=80=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在订单更新接口中添加配送员指派后的状态同步逻辑
- 新增 markShopOrderShippedAfterRiderAssigned 方法用于状态同步
- 实现后台指派配送员时自动将关联商城订单标记为已发货状态
- 添加相关业务方法注释说明使用场景和目的
- 确保配送员指派后订单状态的一致性同步
---
 .../gxwebsoft/glt/controller/GltTicketOrderController.java | 7 +++++++
 .../com/gxwebsoft/glt/service/GltTicketOrderService.java   | 7 +++++++
 .../glt/service/impl/GltTicketOrderServiceImpl.java        | 5 +++++
 3 files changed, 19 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java
index f7e49ee..07f5849 100644
--- a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java
+++ b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java
@@ -242,6 +242,13 @@ public class GltTicketOrderController extends BaseController {
     @PutMapping()
     public ApiResult<?> update(@RequestBody GltTicketOrder gltTicketOrder) {
         if (gltTicketOrderService.updateById(gltTicketOrder)) {
+            // 后台指派配送员（直接改 riderId）时，同步商城订单为“已发货”(deliveryStatus=20)
+            if (gltTicketOrder != null
+                    && gltTicketOrder.getId() != null
+                    && gltTicketOrder.getRiderId() != null
+                    && gltTicketOrder.getRiderId() > 0) {
+                gltTicketOrderService.markShopOrderShippedAfterRiderAssigned(gltTicketOrder.getId(), getTenantId());
+            }
             return success("修改成功");
         }
         return fail("修改失败");
diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java
index 92511a0..3fdb16b 100644
--- a/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java
+++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java
@@ -64,6 +64,13 @@ public interface GltTicketOrderService extends IService<GltTicketOrder> {
      */
     void accept(Integer id, Integer riderId, Integer tenantId);
 
+    /**
+     * 指派/接单成功后，同步关联商城订单发货状态为“已发货”(deliveryStatus=20)。
+     *
+     * <p>用于后台指派配送员（不走接单接口）等场景的状态兜底同步。</p>
+     */
+    void markShopOrderShippedAfterRiderAssigned(Integer ticketOrderId, Integer tenantId);
+
     /**
      * 配送员开始配送：10 -> 20，并写 sendStartTime。
      */
diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java
index f8065c2..2f13605 100644
--- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java
@@ -244,6 +244,11 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
         throw new BusinessException("订单状态不允许接单");
     }
 
+    @Override
+    public void markShopOrderShippedAfterRiderAssigned(Integer ticketOrderId, Integer tenantId) {
+        updateShopOrderDeliveryStatusAfterAccept(ticketOrderId, tenantId, LocalDateTime.now());
+    }
+
     private void updateShopOrderDeliveryStatusAfterAccept(Integer ticketOrderId, Integer tenantId, LocalDateTime now) {
         if (ticketOrderId == null || tenantId == null) {
             return;