From 02528c930ffadc9d375b3c84a1ff42c7994b1eba Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Thu, 10 Jul 2025 15:13:57 +0800 Subject: [PATCH] no message --- .../ghy/web/controller/order/OrderController.java | 12 ++++++++++-- .../com/ghy/order/request/AppOrderAssignRequest.java | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 334bafb0..13f5e9f6 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -418,7 +418,11 @@ public class OrderController extends BaseController { od.setOrderMasterCode(om.getCode()); od.setCustomerId(om.getCustomerId()); od.setOrderType(om.getOrderType()); - od.setOrderStatus(request.getWorkerId().equals(om.getWorkerId()) ? OrderStatus.GOING.code() : OrderStatus.RECEIVE.code()); + if (request.getIsQuicklyDelivery()!=null&&request.getIsQuicklyDelivery()==1){ + od.setOrderStatus(OrderStatus.SERVER.code()); + }else{ + od.setOrderStatus(request.getWorkerId().equals(om.getWorkerId()) ? OrderStatus.GOING.code() : OrderStatus.RECEIVE.code()); + } od.setWorkerId(request.getWorkerId()); od.setRevTime(om.getRevTime()); od.setExpectTimeStart(om.getExpectTimeStart()); @@ -469,7 +473,11 @@ public class OrderController extends BaseController { // 派完单 并且只有自己接单 om2up.setHasDispatchedAll(1); om2up.setAllSelfAssigned(1); - om2up.setOrderStatus(OrderStatus.GOING.code()); + if (request.getIsQuicklyDelivery()!=null&&request.getIsQuicklyDelivery()==1){ + om2up.setOrderStatus(OrderStatus.SERVER.code()); + }else{ + om2up.setOrderStatus(OrderStatus.GOING.code()); + } } else { // 派完单 但是有其他师傅接单 om2up.setHasDispatchedAll(1); diff --git a/ghy-order/src/main/java/com/ghy/order/request/AppOrderAssignRequest.java b/ghy-order/src/main/java/com/ghy/order/request/AppOrderAssignRequest.java index be57a579..2c8b4d80 100644 --- a/ghy-order/src/main/java/com/ghy/order/request/AppOrderAssignRequest.java +++ b/ghy-order/src/main/java/com/ghy/order/request/AppOrderAssignRequest.java @@ -28,4 +28,7 @@ public class AppOrderAssignRequest { // 分配的商品及数量 private List goodsList; + + //是否立即发货 + private Integer isQuicklyDelivery; }