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

Merge branch 'master' of https://git.opsoul.com/clunt/ghy-all

This commit is contained in:
cb 2025-04-17 10:47:01 +08:00
parent 70b31a6a8e cd0fb4c6ce
commit 44eab29981
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -1309,7 +1309,7 @@ public class OrderController extends BaseController {
if (worker != null) { if (worker != null) {
// 师傅实名信息 // 师傅实名信息
workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId());
workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getName(); workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getSurname()+workerRealInfo.getName();
} }
// 消费者信息 // 消费者信息

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

@ -333,7 +333,7 @@ public class OrderDetailController extends BaseController {
if (worker != null) { if (worker != null) {
// 师傅实名信息 // 师傅实名信息
workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId());
workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getName(); workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getSurname()+ workerRealInfo.getName();
} }
workerRealInfo = null; workerRealInfo = null;
// 大师傅信息 // 大师傅信息
@ -341,7 +341,7 @@ public class OrderDetailController extends BaseController {
if (masterWorker != null) { if (masterWorker != null) {
// 大师傅实名信息 // 大师傅实名信息
workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId());
masterWorkerName = workerRealInfo == null ? masterWorker.getName() : workerRealInfo.getName(); masterWorkerName = workerRealInfo == null ? masterWorker.getName() : workerRealInfo.getSurname()+ workerRealInfo.getName();
masterCompanyName = workerRealInfo == null ? null : workerRealInfo.getCompanyName(); masterCompanyName = workerRealInfo == null ? null : workerRealInfo.getCompanyName();
} }
@ -588,7 +588,7 @@ public class OrderDetailController extends BaseController {
if (worker != null) { if (worker != null) {
// 师傅实名信息 // 师傅实名信息
workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId());
workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getName(); workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getSurname()+ workerRealInfo.getName();
} }
// 消费者信息 // 消费者信息
@ -767,7 +767,7 @@ public class OrderDetailController extends BaseController {
if (worker != null) { if (worker != null) {
// 师傅实名信息 // 师傅实名信息
workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId());
workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getName(); workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getSurname()+ workerRealInfo.getName();
} }
// 消费者信息 // 消费者信息
@ -1205,7 +1205,7 @@ public class OrderDetailController extends BaseController {
orderBehaviorService.insert(orderBehavior); orderBehaviorService.insert(orderBehavior);
// 拒单 // 拒单
//TODO:待完善拒单人员
logger.info("师傅资料{}",masterWorker); logger.info("师傅资料{}",masterWorker);
WorkerCertification workerRealInfo = workerCertificationService.selectByWorkerId(od.getWorkerId()); WorkerCertification workerRealInfo = workerCertificationService.selectByWorkerId(od.getWorkerId());
logger.info("认证师傅资料{}",workerRealInfo); logger.info("认证师傅资料{}",workerRealInfo);

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

@ -1135,7 +1135,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(detailWorkerRealInfo != null ? detailWorkerRealInfo.getName() : detailWorker.getName()); orderStandardDetail.setWorkerName(detailWorkerRealInfo != null ?detailWorkerRealInfo.getSurname()+ detailWorkerRealInfo.getName() : detailWorker.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());
@ -1178,7 +1178,7 @@ public class OrderMasterController extends BaseController {
if (worker != null) { if (worker != null) {
// 师傅实名信息 // 师傅实名信息
workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId());
workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getName(); workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getSurname()+workerRealInfo.getName();
} }
// 消费者信息 // 消费者信息
@ -1673,7 +1673,7 @@ public class OrderMasterController extends BaseController {
if (worker != null) { if (worker != null) {
// 师傅实名信息 // 师傅实名信息
workerRealInfo = workerCertificationService.selectByWorkerId(detail.getWorkerId()); workerRealInfo = workerCertificationService.selectByWorkerId(detail.getWorkerId());
workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getName(); workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getSurname()+ workerRealInfo.getName();
} }
// 查询子单加价记录 // 查询子单加价记录