diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java index 147f3c26..949896fa 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java @@ -242,7 +242,15 @@ public class ApiOrderController extends BaseController { orderQueryWrapper.eq(SaOrder::getOrderCode, orderCode).and(wrapper -> wrapper.eq(SaOrder::getPkMember, userId).or().eq(SaOrder::getPkCreator, userId)); SaOrder saOrder = iSaOrderService.getOne(orderQueryWrapper); if (null != saOrder) { - if (EOrderStatus.DELIVERED.getValue() != saOrder.getOrderStatus()) { + List itemList = iSaOrderItemsService.queryDeliverByOrder(saOrder.getPkId()); + boolean statusFlag = false; + for (SaOrderItems item : itemList) { + log.info("orderItem status : {}", item.getOrderStatus()); + if (EOrderStatus.DELIVERED.getValue() != item.getOrderStatus()) { + statusFlag = true; + } + } + if (statusFlag) { // 订单状态不为待收货 return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_STATUS_NOT)); } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml index 8f4f558e..76af759f 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml @@ -1015,7 +1015,7 @@