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