diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java index 38122dfa..61a3cdef 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java @@ -2186,7 +2186,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl orderItems = shopOrderItemService.find( + new QueryWrapper().eq("order_id", orderId)); + if (CollectionUtil.isEmpty(orderItems)) { + return CommonResult.failed("订单没有可退货的商品"); + } + + if (isPartialRefund && orderItems.size() == partialRefundItemCnt) { + isPartialRefund = false; + } + // === 5. 创建退货单(如不存在) === ShopOrderReturn refundOrder = null; if (!hasRefundRecord) { - // 5.1 获取订单商品项 - List orderItems = shopOrderItemService.find( - new QueryWrapper().eq("order_id", orderId)); - if (CollectionUtil.isEmpty(orderItems)) { - return CommonResult.failed("订单没有可退货的商品"); - } // 5.2 准备退货请求数据 OrderReturnInputVo refundRequest = new OrderReturnInputVo();