diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index abe72c0e..71bb0d83 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -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); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 91ab725d..88063eb2 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -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());