From c99691591e682b32b097cd3a1154b400310bcb64 Mon Sep 17 00:00:00 2001 From: HH Date: Sat, 4 Mar 2023 23:48:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AE=A2=E5=8D=95=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E7=9B=AE=E5=89=8D=E5=8F=AA=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BA=86=E5=88=86=E9=85=8D=E8=AE=A2=E5=8D=95=E3=80=81=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E8=AE=A2=E5=8D=95=E3=80=81=E6=8B=92=E7=BB=9D=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=8E=A5=E5=8D=95=E7=9A=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B2=A1=E6=89=BE=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderBehaviorController.java | 1 - .../controller/order/OrderDetailController.java | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderBehaviorController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderBehaviorController.java index 0e48ecb0..afb0a4b3 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderBehaviorController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderBehaviorController.java @@ -5,7 +5,6 @@ import com.ghy.order.domain.OrderBehavior; import com.ghy.order.service.OrderBehaviorService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 75523cce..25cca923 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -759,7 +759,7 @@ public class OrderDetailController extends BaseController { } // 存储完单图 - List finishImgObjList = new ArrayList(); + List finishImgObjList = new ArrayList<>(); for (String imgUrl : request.getFinishImgList()) { GoodsImgs finishImgObj = new GoodsImgs(); finishImgObj.setGoodsId(0L); @@ -791,6 +791,15 @@ public class OrderDetailController extends BaseController { int affectedRow = orderDetailService.updateOrderDetail(updateOrderDetail); Assert.isTrue(affectedRow == 1, "子订单修改失败，orderDetail=" + orderDetail); + Worker worker = workerService.selectById(orderDetail.getWorkerId()); + + OrderBehavior orderBehavior = new OrderBehavior() + .setOrderMasterId(orderMaster.getId()).setOrderMasterCode(orderMaster.getCode()) + .setOrderDetailId(orderDetail.getId()).setOrderDetailCode(orderDetail.getCode()) + .setWorkerId(worker.getWorkerId()).setWorkerName(worker.getName()) + .setBehavior(OrderBehaviorEnum.FINISH_ORDER); + orderBehaviorService.insert(orderBehavior); + return AjaxResult.success("发起成功"); } @@ -839,8 +848,10 @@ public class OrderDetailController extends BaseController { orderMaster2Update.setHasDispatchedAll(0); orderMasterService.updateOrderMaster(orderMaster2Update); - OrderBehavior orderBehavior = new OrderBehavior().setOrderMasterId(om.getId()).setOrderMasterCode(om.getCode()) - .setWorkerId(worker.getWorkerId()).setWorkerName(worker.getName()).setBehavior(OrderBehaviorEnum.REFUSE_ORDER); + OrderBehavior orderBehavior = new OrderBehavior() + .setOrderMasterId(om.getId()).setOrderMasterCode(om.getCode()) + .setWorkerId(worker.getWorkerId()).setWorkerName(worker.getName()) + .setBehavior(OrderBehaviorEnum.REFUSE_ORDER); orderBehaviorService.insert(orderBehavior); return AjaxResult.success();