clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

师傅必须认证审核通过后才能发起完单

This commit is contained in:
HH 2023-04-13 21:52:29 +08:00
parent 438ea3aee7
commit de68791a44
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -777,6 +777,13 @@ public class OrderDetailController extends BaseController {
return AjaxResult.error("未支付订单或非服务中订单，发起完单失败"); 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<GoodsImgs> finishImgObjList = new ArrayList<>(); List<GoodsImgs> finishImgObjList = new ArrayList<>();
for (String imgUrl : request.getFinishImgList()) { for (String imgUrl : request.getFinishImgList()) {
@ -810,8 +817,6 @@ public class OrderDetailController extends BaseController {
int affectedRow = orderDetailService.updateOrderDetail(updateOrderDetail); int affectedRow = orderDetailService.updateOrderDetail(updateOrderDetail);
Assert.isTrue(affectedRow == 1, "子订单修改失败，orderDetail=" + orderDetail); Assert.isTrue(affectedRow == 1, "子订单修改失败，orderDetail=" + orderDetail);
Worker worker = workerService.selectById(orderDetail.getWorkerId());
OrderBehavior orderBehavior = new OrderBehavior() OrderBehavior orderBehavior = new OrderBehavior()
.setOrderMasterId(orderMaster.getId()).setOrderMasterCode(orderMaster.getCode()) .setOrderMasterId(orderMaster.getId()).setOrderMasterCode(orderMaster.getCode())
.setOrderDetailId(orderDetail.getId()).setOrderDetailCode(orderDetail.getCode()) .setOrderDetailId(orderDetail.getId()).setOrderDetailCode(orderDetail.getCode())