|
@@ -1800,9 +1800,13 @@ public class ProductOrderService {
|
|
|
if (order.getRefundStatus() != null && order.getRefundStatus() == 1) {
|
|
if (order.getRefundStatus() != null && order.getRefundStatus() == 1) {
|
|
|
return Result.error("已有退款申请正在处理中");
|
|
return Result.error("已有退款申请正在处理中");
|
|
|
}
|
|
}
|
|
|
- order.setRefundStatus(1); // 申请中
|
|
|
|
|
|
|
+ // 记录退款前状态,供管理员驳回时回滚(写死 paid 会让「待收货」单驳回后错乱)
|
|
|
|
|
+ order.setRefundBeforeStatus(order.getStatus());
|
|
|
|
|
+ order.setRefundBeforeRefundStatus(order.getRefundStatus() != null ? order.getRefundStatus() : 0);
|
|
|
|
|
+ order.setRefundStatus(1); // 申请中(待后台审核)
|
|
|
order.setRefundReason(reason);
|
|
order.setRefundReason(reason);
|
|
|
- order.setStatus("refunding");
|
|
|
|
|
|
|
+ // 用户申请退款 = 待退款(等后台审核),不是退款中
|
|
|
|
|
+ order.setStatus("pending_refund");
|
|
|
order.setUpdatedAt(new Date());
|
|
order.setUpdatedAt(new Date());
|
|
|
orderMapper.updateById(order);
|
|
orderMapper.updateById(order);
|
|
|
return Result.success("退款申请已提交");
|
|
return Result.success("退款申请已提交");
|
|
@@ -1825,9 +1829,10 @@ public class ProductOrderService {
|
|
|
if (refundAmount == null || refundAmount < 0) {
|
|
if (refundAmount == null || refundAmount < 0) {
|
|
|
refundAmount = order.getTotalAmount();
|
|
refundAmount = order.getTotalAmount();
|
|
|
}
|
|
}
|
|
|
|
|
+ String wxStatus = null; // 微信退款受理状态:SUCCESS=资金已退回;PROCESSING=已受理、到账中
|
|
|
if (refundAmount != null && refundAmount > 0) {
|
|
if (refundAmount != null && refundAmount > 0) {
|
|
|
try {
|
|
try {
|
|
|
- paymentService.refund(orderNo, refundAmount, order.getRefundReason());
|
|
|
|
|
|
|
+ wxStatus = paymentService.refund(orderNo, refundAmount, order.getRefundReason());
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
if (e.getMessage() != null && e.getMessage().contains("NOT_ENOUGH")) {
|
|
if (e.getMessage() != null && e.getMessage().contains("NOT_ENOUGH")) {
|
|
|
pendingRefundService.createPendingRefund(order.getBuyerId(), null, refundAmount, "product", orderNo);
|
|
pendingRefundService.createPendingRefund(order.getBuyerId(), null, refundAmount, "product", orderNo);
|
|
@@ -1847,6 +1852,27 @@ public class ProductOrderService {
|
|
|
// 优惠券/积分全额抵扣、用户未付现金:直接走完退款流程,无需调微信退款接口
|
|
// 优惠券/积分全额抵扣、用户未付现金:直接走完退款流程,无需调微信退款接口
|
|
|
log.info("订单实付金额为0(优惠券/积分全额抵扣),跳过微信退款: orderNo={}", orderNo);
|
|
log.info("订单实付金额为0(优惠券/积分全额抵扣),跳过微信退款: orderNo={}", orderNo);
|
|
|
}
|
|
}
|
|
|
|
|
+ if ("PROCESSING".equals(wxStatus)) {
|
|
|
|
|
+ // 微信已受理、资金到账中(银行卡退款 1-3 天):置退款中,副作用延后到「确认到账」
|
|
|
|
|
+ order.setRefundStatus(2);
|
|
|
|
|
+ order.setRefundAmount(refundAmount);
|
|
|
|
|
+ order.setRefundTime(new Date());
|
|
|
|
|
+ order.setStatus("refunding");
|
|
|
|
|
+ order.setUpdatedAt(new Date());
|
|
|
|
|
+ orderMapper.updateById(order);
|
|
|
|
|
+ syncAfterSalesRequestStatus(orderNo, "approved", adminId);
|
|
|
|
|
+ log.info("退款已受理、到账中: orderNo={}", orderNo);
|
|
|
|
|
+ return Result.success("退款已受理,到账后将自动完成");
|
|
|
|
|
+ }
|
|
|
|
|
+ // SUCCESS 或全额抵扣路径:资金已退回,直接完成退款(含库存/券/CF 还原)
|
|
|
|
|
+ finalizeRefund(order, adminId, refundAmount);
|
|
|
|
|
+ syncAfterSalesRequestStatus(orderNo, "approved", adminId);
|
|
|
|
|
+ log.info("退款完成: orderNo={}, adminId={}", orderNo, adminId);
|
|
|
|
|
+ return Result.success("退款已处理");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /** 退款终态收尾:置已退款 + 库存回补 + 券/CF 还原 + 特价扣量回滚。SUCCESS 即时、确认到账时复用。 */
|
|
|
|
|
+ public void finalizeRefund(ProductOrder order, Long adminId, Integer refundAmount) {
|
|
|
order.setRefundStatus(2);
|
|
order.setRefundStatus(2);
|
|
|
order.setRefundAmount(refundAmount);
|
|
order.setRefundAmount(refundAmount);
|
|
|
order.setRefundTime(new Date());
|
|
order.setRefundTime(new Date());
|
|
@@ -1859,11 +1885,11 @@ public class ProductOrderService {
|
|
|
productService.increaseStock(order.getProductId(), order.getQuantity());
|
|
productService.increaseStock(order.getProductId(), order.getQuantity());
|
|
|
}
|
|
}
|
|
|
inventoryService.recordRefundInbound(order.getProductId(), null, order.getQuantity(),
|
|
inventoryService.recordRefundInbound(order.getProductId(), null, order.getQuantity(),
|
|
|
- "order", order.getId(), adminId, "退款:" + orderNo);
|
|
|
|
|
|
|
+ "order", order.getId(), adminId, "退款:" + order.getOrderNo());
|
|
|
// 退款成功:归还优惠券;CF 兑换来的券同时退还 CF 值
|
|
// 退款成功:归还优惠券;CF 兑换来的券同时退还 CF 值
|
|
|
releaseCouponForCancelledOrder(order.getCouponId());
|
|
releaseCouponForCancelledOrder(order.getCouponId());
|
|
|
// F-5:退还下单时抵扣的 CF 值(原路返还到购买人 member 账本)
|
|
// F-5:退还下单时抵扣的 CF 值(原路返还到购买人 member 账本)
|
|
|
- refundOrderPoints(order, "退款退还CF值:" + orderNo);
|
|
|
|
|
|
|
+ refundOrderPoints(order, "退款退还CF值:" + order.getOrderNo());
|
|
|
// 特价订单回滚扣量(与恢复库存并列,失败仅记日志不阻断退款)
|
|
// 特价订单回滚扣量(与恢复库存并列,失败仅记日志不阻断退款)
|
|
|
try {
|
|
try {
|
|
|
specialPriceService.releaseQuota(order.getSpecialDealId(), order.getQuantity());
|
|
specialPriceService.releaseQuota(order.getSpecialDealId(), order.getQuantity());
|
|
@@ -1871,9 +1897,28 @@ public class ProductOrderService {
|
|
|
log.warn("特价扣量回滚失败(refund): dealId={}, orderNo={}, err={}",
|
|
log.warn("特价扣量回滚失败(refund): dealId={}, orderNo={}, err={}",
|
|
|
order.getSpecialDealId(), order.getOrderNo(), ex.getMessage());
|
|
order.getSpecialDealId(), order.getOrderNo(), ex.getMessage());
|
|
|
}
|
|
}
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ public Result<String> confirmRefundArrive(String orderNo, Long adminId) {
|
|
|
|
|
+ ProductOrder order = orderMapper.selectOne(
|
|
|
|
|
+ new LambdaQueryWrapper<ProductOrder>().eq(ProductOrder::getOrderNo, orderNo));
|
|
|
|
|
+ if (order == null) {
|
|
|
|
|
+ return Result.error("订单不存在");
|
|
|
|
|
+ }
|
|
|
|
|
+ if ("refunded".equals(order.getStatus())) {
|
|
|
|
|
+ return Result.success("已退款"); // 幂等:重复确认不重复副作用
|
|
|
|
|
+ }
|
|
|
|
|
+ if (!"refunding".equals(order.getStatus())) {
|
|
|
|
|
+ return Result.error("当前状态不可确认到账");
|
|
|
|
|
+ }
|
|
|
|
|
+ Integer refundAmount = order.getRefundAmount() != null ? order.getRefundAmount() : order.getMoneyAmount();
|
|
|
|
|
+ if (refundAmount == null || refundAmount < 0) {
|
|
|
|
|
+ refundAmount = order.getTotalAmount();
|
|
|
|
|
+ }
|
|
|
|
|
+ finalizeRefund(order, adminId, refundAmount);
|
|
|
syncAfterSalesRequestStatus(orderNo, "approved", adminId);
|
|
syncAfterSalesRequestStatus(orderNo, "approved", adminId);
|
|
|
- log.info("退款完成: orderNo={}, adminId={}", orderNo, adminId);
|
|
|
|
|
- return Result.success("退款已处理");
|
|
|
|
|
|
|
+ log.info("确认退款到账: orderNo={}, adminId={}", orderNo, adminId);
|
|
|
|
|
+ return Result.success("已确认到账,退款完成");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public Result<String> rejectRefund(String orderNo, Long adminId, String reason) {
|
|
public Result<String> rejectRefund(String orderNo, Long adminId, String reason) {
|
|
@@ -1886,7 +1931,8 @@ public class ProductOrderService {
|
|
|
return Result.error("没有待处理的退款申请");
|
|
return Result.error("没有待处理的退款申请");
|
|
|
}
|
|
}
|
|
|
order.setRefundStatus(3);
|
|
order.setRefundStatus(3);
|
|
|
- order.setStatus("paid");
|
|
|
|
|
|
|
+ // 回滚到申请退款前的状态(如待收货),不再写死 paid
|
|
|
|
|
+ order.setStatus(order.getRefundBeforeStatus() != null ? order.getRefundBeforeStatus() : "paid");
|
|
|
order.setUpdatedAt(new Date());
|
|
order.setUpdatedAt(new Date());
|
|
|
orderMapper.updateById(order);
|
|
orderMapper.updateById(order);
|
|
|
syncAfterSalesRequestStatus(orderNo, "rejected", adminId);
|
|
syncAfterSalesRequestStatus(orderNo, "rejected", adminId);
|