backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

打包费退款

Browse Source
This commit is contained in:
Jack 2025-08-16 23:39:57 +08:00
parent 19fb718496
commit f8c7da74df
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
View File

@ -1447,20 +1447,6 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
Date now = new Date();
// // 判断是否需要退款？
// if (shopStoreConfigService.checkNeedRefund(return_state_id, return_next_state_id)) {
// // 执行真正退款逻辑
// // 卖家账户扣款，买家账户增加
// // 佣金问题
// shopOrderReturn.setReturn_is_paid(1); // 0-退货未完成；1-退货完成
// shopOrderReturn.setReturn_finish_time(now);
//
// // 执行退款操作
// if (!payService.doRefund(return_rows)) {
// throw new ApiException(ResultCode.FAILED);
// }
// }
//修改退货订单及其相关商品为下一个待处理状态
editShopOrderReturnAndItemNextState(return_ids, return_state_id, shopOrderReturn);
@ -1491,7 +1477,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
List<ShopOrderReturnItem> returnItemList = orderReturnItemService.find(returnItemQueryWrapper);
BigDecimal return_item_subtotal = returnItemList.stream().map(s -> s.getReturn_item_subtotal()).reduce(BigDecimal::add).get();
// 全部退款完成
// 全部退款的情况
if (ObjectUtil.compare(order_item_payment_amount, return_item_subtotal) == 0) {
ShopOrderData shopOrderData = new ShopOrderData();
@ -1563,7 +1549,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
throw new ApiException(I18nUtil._("生成退运费订单失败！"));
}
// 修正退款总额 为 加上运费的。
// 修正退款总额 为 加上运费
ShopOrderData orderData = shopOrderDataService.get(order_id);
BigDecimal order_refund_amount = orderData.getOrder_refund_amount();
// 退款金额+运费
@ -1573,10 +1559,17 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
throw new ApiException(I18nUtil._("修改订单退款总额(加运费)失败！"));
}
// 最后一个退款订单如果有运费，加上运费
return_row.setReturn_refund_amount(order_refund_amount_add_fee);
}
// 如果有打包费，退款金额加上 打包费
if (order_data_row != null && order_data_row.getPacking_fee().compareTo(BigDecimal.ZERO) > 0) {
// 退款金额+打包费
BigDecimal order_refund_amount_add_fee = NumberUtil.add(order_data_row.getOrder_refund_amount(), order_data_row.getPacking_fee());
// 最后一个退款订单如果有打包费，加上打包费
return_row.setReturn_refund_amount(order_refund_amount_add_fee);
}
}
@ -1615,7 +1608,6 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
}
}
return true;
}