diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 439b0924..96e3cf6c 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -539,7 +539,9 @@ public class PayServiceImpl implements PayService { } orderDetail.setRefundNo(refPayOrderNo); orderDetail.setRefundRemark(orderDetail.getRefundRemark() + param.getRefundReason()); - orderDetail.setReturnAmount(refundDetail.getReturnAmount()); + if (isPay) { + orderDetail.setReturnAmount(refundDetail.getReturnAmount()); + } orderDetailService.updateById(orderDetail); if (orderDetail.getProductId() != null && orderDetail.getProductId() > 0) { returnProMap.put(Convert.toStr(orderDetail.getProductId()), refundDetail.getNum()); @@ -565,6 +567,7 @@ public class PayServiceImpl implements PayService { if (orderDetail.getProductId() != null && orderDetail.getProductId() > 0) { returnProMap.put(Convert.toStr(orderDetail.getProductId()), orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(orderDetail.getRefundNum())); } + orderDetail.setReturnAmount(orderDetail.getPayAmount()); orderDetail.setRefundNum(orderDetail.getNum().subtract(orderDetail.getReturnNum())); orderDetail.setStatus(OrderStatusEnums.REFUND.getCode()); } else {