From 00e14f41709cedefb5c8d8fe63d0a960e5e94fd2 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Wed, 22 Jun 2022 21:27:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B4=BE=E5=8D=95=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BB=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ghy/web/controller/order/OrderController.java | 5 +++++ .../java/com/ghy/order/request/AppOrderAssignRequest.java | 3 +++ 2 files changed, 8 insertions(+) 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 253ea026..c2d99f1d 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 @@ -131,6 +131,11 @@ public class OrderController extends BaseController { Assert.isTrue(checkInTeam, "接单师傅不在本团队"); } + // 判断是否全部派完 + if(request.getIsAll() == 1){ + om.setOrderStatus(OrderStatus.GOING.code()); + orderMasterService.updateOrderMaster(om); + } // 创建子订单 OrderDetail od = new OrderDetail(); 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 fe92df2a..be57a579 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 @@ -23,6 +23,9 @@ public class AppOrderAssignRequest { // 价格 private BigDecimal totalPay; + // 是否全部派完 + private int isAll; + // 分配的商品及数量 private List goodsList; }