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-11-04 08:57:27 +08:00
parent a36d9374dd
commit e1e41d98bc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2151,6 +2151,7 @@ public class OrderController extends BaseController {
// 编辑返回属性
orderListResponse.setServiceCancelled(master.getServiceCancelled());
orderListResponse.setAfterPlatformServiceStatus(master.getAfterServiceStatus());
orderListResponse.setShowInMonitor(master.getShowInMonitor());
orderListResponse.setShowAfterServiceRecord(hasMatchingAfterService ? 1 : 0);

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

@ -846,7 +846,7 @@ public class OrderDetailController extends BaseController {
// 判断售后状态，如果售后状态不为1才显示售后记录按钮
boolean hasNonDisputeStatus = afterServiceRecordList.stream()
.anyMatch(record -> record.getAfterServiceStatus() != null && record.getAfterServiceStatus().equals(1));
.anyMatch(record -> record.getAfterServiceStatus() != null && (record.getAfterServiceStatus().equals(1)||record.getAfterServiceStatus().equals(2)));
orderListResponse.setShowAfterServiceRecord(hasNonDisputeStatus ? 0 : 1);
orderListResponse.setIsNeedBill(orderMaster.getIsNeedBill());
orderListResponse.setIsMonitoredOrder(orderMaster.getIsMonitoredOrder());
@ -879,6 +879,7 @@ public class OrderDetailController extends BaseController {
orderListResponse.setServiceShopId(serviceShop != null ? serviceShop.getShopId() : null);
// 编辑返回属性
orderListResponse.setAfterPlatformServiceStatus(detail.getAfterServiceStatus());
orderListResponse.setShareAccountCountdownEndTime(detail.getShareAccountCountdownEndTime());
orderListResponse.setShareAccountCountdownDuration(detail.getShareAccountCountdownDuration());
orderListResponse.setOrderDetailId(detail.getId());