From de68791a44134e49eaf28aaff7898f76f3af71cd Mon Sep 17 00:00:00 2001 From: HH Date: Thu, 13 Apr 2023 21:52:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E5=BF=85=E9=A1=BB=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=90=8E=E6=89=8D?= =?UTF-8?q?=E8=83=BD=E5=8F=91=E8=B5=B7=E5=AE=8C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/web/controller/order/OrderDetailController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 20bd85e7..fd09497b 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 @@ -777,6 +777,13 @@ public class OrderDetailController extends BaseController { return AjaxResult.error("未支付订单或非服务中订单，发起完单失败"); } + Worker worker = workerService.selectById(orderDetail.getWorkerId()); + Assert.notNull(worker, "师傅不存在 workerId=" + orderDetail.getWorkerId()); + WorkerCertification wcc = workerCertificationService.selectByWorkerId(orderDetail.getWorkerId()); + if (wcc == null || wcc.getStatus() == null || wcc.getStatus() != 1) { + return AjaxResult.error("师傅未认证，请先去认证哦！"); + } + // 存储完单图 List finishImgObjList = new ArrayList<>(); for (String imgUrl : request.getFinishImgList()) { @@ -810,8 +817,6 @@ 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())