diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 95b90a8b..cdeee38b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -32,6 +32,8 @@ import com.ghy.payment.service.FinancialDetailService; import com.ghy.payment.service.FinancialMasterService; import com.ghy.web.pojo.vo.*; import com.ghy.worker.domain.Worker; +import com.ghy.worker.domain.WorkerCertification; +import com.ghy.worker.service.IWorkerCertificationService; import com.ghy.worker.service.WorkerService; import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; @@ -69,6 +71,8 @@ public class OrderMasterController extends BaseController { @Autowired private WorkerService workerService; @Autowired + private IWorkerCertificationService workerCertificationService; + @Autowired private OrderDetailService orderDetailService; @Autowired private OrderGoodsService orderGoodsService; @@ -186,6 +190,8 @@ public class OrderMasterController extends BaseController { List standardList = new ArrayList<>(); // 子单施工师傅信息 Worker detailWorker = workerService.selectById(orderDetail.getWorkerId()); + // 师傅实名信息 + WorkerCertification detailWorkerRealInfo = workerCertificationService.selectByWorkerId(orderDetail.getWorkerId()); // 子单商品规格及信息 List orderStandardList = orderGoodsService.selectByOrderDetailId(orderDetail.getId()); @@ -203,7 +209,7 @@ public class OrderMasterController extends BaseController { orderStandardDetail.setOrderDetailCode(orderDetail.getCode()); orderStandardDetail.setWorkBeginTime(orderDetail.getWorkBeginTime()); orderStandardDetail.setWorkFinishTime(orderDetail.getWorkFinishTime()); - orderStandardDetail.setWorkerName(detailWorker.getName()); + orderStandardDetail.setWorkerName(detailWorkerRealInfo.getName()); orderStandardDetail.setWorkerPhone(detailWorker.getPhone()); orderStandardDetail.setRevTime(orderDetail.getRevTime()); orderStandardDetail.setExpectTimeStart(orderDetail.getExpectTimeStart()); @@ -220,6 +226,9 @@ public class OrderMasterController extends BaseController { // 师傅信息 Worker worker = workerService.selectById(orderMaster.getWorkerId()); + // 师傅实名信息 + WorkerCertification workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); + // 消费者信息 Customer customer = customerService.selectByCustomerId(orderMaster.getCustomerId()); @@ -254,7 +263,7 @@ public class OrderMasterController extends BaseController { orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney()); orderListResponse.setTotalMoney(financialMaster.getTotalMoney()); orderListResponse.setPayMoney(financialMaster.getPayMoney()); - orderListResponse.setWorkerName(worker == null ? "" : worker.getName()); + orderListResponse.setWorkerName(workerRealInfo == null ? "" : workerRealInfo.getName()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerPhone(customer.getPhone());