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();