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

no message

This commit is contained in:
cb 2025-10-16 14:28:11 +08:00
parent 16891e331d
commit fe13c91ab2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2169,10 +2169,10 @@ public class OrderController extends BaseController {
} }
// 售后记录 // 售后记录
// AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); AfterServiceRecord afterServiceRecord = new AfterServiceRecord();
// afterServiceRecord.setOrderDetailId(detail.getId()); afterServiceRecord.setOrderDetailId(detail.getId());
// List<AfterServiceRecord> afterServiceRecordList List<AfterServiceRecord> afterServiceRecordList
// =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord);
// 编辑返回属性 // 编辑返回属性
orderListResponse.setWorkerRemark(detail.getWorkerRemark()); orderListResponse.setWorkerRemark(detail.getWorkerRemark());
@ -2257,7 +2257,7 @@ public class OrderController extends BaseController {
orderListResponse.setInsuranceManager(manager); orderListResponse.setInsuranceManager(manager);
} }
} }
// orderListResponse.setAfterServiceRecordList(afterServiceRecordList); orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
} }
return orderListResponses; return orderListResponses;

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

@ -1900,7 +1900,7 @@ public class OrderMasterController extends BaseController {
workerRealInfo=goodsWorkerRealInfo; workerRealInfo=goodsWorkerRealInfo;
} }
masterCompanyName = workerRealInfo == null ? null : workerRealInfo.getCompanyName(); masterCompanyName = workerRealInfo == null ? null : workerRealInfo.getCompanyName();
masterCompanyPhone=workerRealInfo == null ? null : workerRealInfo.getLegalPersionPhoneNum(); masterCompanyPhone=goodsWorker.getPhone();
} }
// 商品信息 // 商品信息