diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index 6aa797a0..c773836e 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -6610,7 +6610,8 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl 0) { - log.debug("[是否禁止退货] 订单已超过退货期限,禁止退货,order_id: {}, orderDealTime: {}, withdrawTime: {}", + log.info("[是否禁止退货] 订单已超过退货期限,禁止退货,order_id: {}, orderDealTime: {}, withdrawTime: {}", orderId, orderDealTime, withdrawTime); return true; } } catch (Exception e) { - log.error("[是否禁止退货] 检查订单退货期限时发生异常,禁止退货,order_id: {}", orderId, e); + log.info("[是否禁止退货] 检查订单退货期限时发生异常,禁止退货,order_id: {}", orderId, e); return true; } } @@ -2533,19 +2533,19 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl contractTypeIds = Convert.toList(Integer.class, contractTypeIdsStr); if (contractTypeIds != null && contractTypeIds.contains(StateCode.CONTRACT_TYPE_DENY_RETURN)) { - log.debug("[是否禁止退货] 商品设置了禁止退货标识,禁止退货,order_id: {}, product_id: {}", orderId, productIndex.getProduct_id()); + log.info("[是否禁止退货] 商品设置了禁止退货标识,禁止退货,order_id: {}, product_id: {}", orderId, productIndex.getProduct_id()); return true; } } catch (Exception e) { @@ -2581,13 +2581,13 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl 0 - // 2. 可退金额 > 0 - return orderItemQuantity > orderItemReturnNum - && orderItemAmount.compareTo(orderItemReturnAgreeAmount) > 0; + // 1. 可退数量 > 0 (订单商品数量 > 已退货数量) + boolean canReturnQuantity = orderItemQuantity > orderItemReturnNum; + // 2. 可退金额 > 0 (订单商品金额 > 已同意退款金额) + boolean canReturnAmount = orderItemAmount.compareTo(orderItemReturnAgreeAmount) > 0; + + log.info("退款条件检查结果 - 可退数量: {}, 可退金额: {}", canReturnQuantity, canReturnAmount); + + return canReturnQuantity && canReturnAmount; }