From 2a6aefd2f0060aac1d1b28540d97cc10e031d0a1 Mon Sep 17 00:00:00 2001 From: donqi Date: Thu, 22 Sep 2022 00:37:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderMasterController.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 3464de09..ec8d3797 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -41,6 +41,7 @@ import com.ghy.worker.domain.WorkerCertification; import com.ghy.worker.service.IWorkerCertificationService; import com.ghy.worker.service.WorkerService; import com.huifu.adapay.core.exception.BaseAdaPayException; +import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -128,11 +129,14 @@ public class OrderMasterController extends BaseController { CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId()); // 查询是否超时 + List timeoutRecords = new ArrayList<>(); List detailOrderList = orderDetailService.selectByOrderMasterId(master.getId()); - List detailOrderIds = detailOrderList.stream().map(OrderDetail::getId).collect(Collectors.toList()); - OrderTimeoutRecord params = new OrderTimeoutRecord(); - params.setOrderDetailIds(detailOrderIds); - List timeoutRecords = orderFineRecordService.selectList(params); + detailOrderList.stream().forEach(detail -> { + OrderTimeoutRecord timeoutRecord = orderFineRecordService.selectByDetailIdAndStatus(detail.getId(), detail.getOrderStatus()); + if (timeoutRecord != null) { + timeoutRecords.add(timeoutRecord); + } + }); for (OrderGoods orderGoods : orderStandardList) { OrderStandard orderStandard = new OrderStandard();