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

订单中的师傅名称查询实名

This commit is contained in:
donqi 2022-07-19 15:12:46 +08:00
parent 248c4d5ee3
commit d4eafd2e86
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

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