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; }