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-17 16:53:54 +08:00
parent 8bbacc653f
commit a805c562c9
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1658,6 +1658,9 @@ public class OrderController extends BaseController {
standardList.add(orderStandard); standardList.add(orderStandard);
} }
if (worker != null) {
orderListResponse.setWorkerId(worker.getWorkerId());
}
// 编辑返回属性 // 编辑返回属性
orderListResponse.setIsNeedBill(master.getIsNeedBill()); orderListResponse.setIsNeedBill(master.getIsNeedBill());
orderListResponse.setIsMonitoredOrder(master.getIsMonitoredOrder()); orderListResponse.setIsMonitoredOrder(master.getIsMonitoredOrder());
@ -1840,6 +1843,8 @@ public class OrderController extends BaseController {
orderListResponse.setIsOnlyServ(Boolean.FALSE); orderListResponse.setIsOnlyServ(Boolean.FALSE);
} }
orderListResponse.setShowAfterServiceRecord( 1);
// 编辑返回属性 // 编辑返回属性
orderListResponse.setGoodsBrand(orderMaster.getGoodsBrand()); orderListResponse.setGoodsBrand(orderMaster.getGoodsBrand());
orderListResponse.setGoodsSpecification(orderMaster.getGoodsSpecification()); orderListResponse.setGoodsSpecification(orderMaster.getGoodsSpecification());
@ -1968,7 +1973,7 @@ public class OrderController extends BaseController {
changeMoney = changeMoney.add(changeRecord.getChangeMoney()); changeMoney = changeMoney.add(changeRecord.getChangeMoney());
} }
} }
worker=workerService.selectById(master.getWorkerId());
// 地址信息 // 地址信息
CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId()); CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
SysArea sysArea; SysArea sysArea;
@ -1991,7 +1996,7 @@ public class OrderController extends BaseController {
.selectAfterServiceRecordList(afterServiceRecordQry); .selectAfterServiceRecordList(afterServiceRecordQry);
// 检查子单师傅ID是否与主单师傅ID一致且有售后记录 // 检查子单师傅ID是否与主单师傅ID一致且有售后记录
afterServiceRecords.addAll(records); afterServiceRecords.addAll(records);
if (detail.getWorkerId() != null && detail.getWorkerId().equals(master.getWorkerId()) && !records.isEmpty()) { if (detail.getWorkerId() != null && detail.getWorkerId()== master.getWorkerId()) {
mewAfterServiceRecords.addAll(records); mewAfterServiceRecords.addAll(records);
} }
}); });
@ -2014,8 +2019,11 @@ public class OrderController extends BaseController {
|| master.getOrderStatus() == 3 || master.getOrderStatus() == 3
|| master.getOrderStatus() == 4)) || master.getOrderStatus() == 4))
&& master.getWorkerId() != null; && master.getWorkerId() != null;
logger.info("是否为监控单{}主单id{}", condition, master);
// 编辑返回属性 // 编辑返回属性
orderListResponse.setShowInMonitor(master.getShowInMonitor());
orderListResponse.setShowAfterServiceRecord(hasMatchingAfterService ? 1 : 0); orderListResponse.setShowAfterServiceRecord(hasMatchingAfterService ? 1 : 0);
orderListResponse.setWorkerRemark(master.getWorkerRemark()); orderListResponse.setWorkerRemark(master.getWorkerRemark());
orderListResponse.setGoods(goods); orderListResponse.setGoods(goods);
@ -2040,6 +2048,9 @@ public class OrderController extends BaseController {
orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setPayMoney(financialMaster.getPayMoney());
orderListResponse.setWorkerName(worker == null ? "" : worker.getName()); orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
if (worker != null) {
orderListResponse.setWorkerId(worker.getWorkerId());
}
orderListResponse.setCustomerName( orderListResponse.setCustomerName(
StringUtils.isNotEmpty(master.getName()) ? master.getName() : customerAddress.getName()); StringUtils.isNotEmpty(master.getName()) ? master.getName() : customerAddress.getName());
orderListResponse.setCustomerPhone( orderListResponse.setCustomerPhone(
@ -2257,6 +2268,7 @@ public class OrderController extends BaseController {
afterServiceRecord.setOrderDetailId(detail.getId()); afterServiceRecord.setOrderDetailId(detail.getId());
List<AfterServiceRecord> afterServiceRecordList List<AfterServiceRecord> afterServiceRecordList
=afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord);
orderListResponse.setShowAfterServiceRecord( 1);
// 编辑返回属性 // 编辑返回属性
orderListResponse.setWorkerRemark(detail.getWorkerRemark()); orderListResponse.setWorkerRemark(detail.getWorkerRemark());

3
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -325,4 +325,7 @@ public class OrderListResponse {
* 是否显示售后记录：0=不显示，1=显示 * 是否显示售后记录：0=不显示，1=显示
*/ */
private Integer showAfterServiceRecord = 0; private Integer showAfterServiceRecord = 0;
@Excel(name = "是否显示在监控单", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=不显示,1=显示在监控单")
private Integer showInMonitor;
} }