From 2d8c14a77a935e0b50a5f7aede47b9a5cc2e3757 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 24 Nov 2025 14:54:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/PayServiceImpl.java    | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

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 4dd514330..186c65d3c 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
@@ -1,9 +1,7 @@
 package com.czg.service.order.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.exceptions.ValidateException;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
@@ -20,27 +18,29 @@ import com.czg.enums.ShopUserFlowBizEnum;
 import com.czg.exception.CzgException;
 import com.czg.exception.PaySuccessException;
 import com.czg.market.dto.MemberOrderDTO;
+import com.czg.market.entity.MemberOrder;
 import com.czg.market.entity.MkShopCouponRecord;
-import com.czg.market.entity.MkShopRecharge;
 import com.czg.market.entity.MkShopRechargeDetail;
 import com.czg.market.service.*;
 import com.czg.market.vo.MkShopRechargeVO;
-import com.czg.order.dto.BigDecimalDTO;
 import com.czg.order.dto.CheckOrderPay;
 import com.czg.order.dto.OrderInfoRefundDTO;
-import com.czg.market.entity.MemberOrder;
 import com.czg.order.entity.OrderDetail;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.entity.OrderPayment;
 import com.czg.order.enums.PayEnums;
-import com.czg.order.service.*;
+import com.czg.order.service.CreditBuyerOrderService;
+import com.czg.order.service.OrderDetailService;
+import com.czg.order.service.OrderInfoService;
+import com.czg.order.service.OrderPaymentService;
 import com.czg.resp.CzgRespCode;
 import com.czg.resp.CzgResult;
-import com.czg.sa.StpKit;
 import com.czg.service.CzgPayService;
 import com.czg.service.RedisService;
-import com.czg.service.market.service.impl.MemberOrderServiceImpl;
-import com.czg.service.order.dto.*;
+import com.czg.service.order.dto.OrderPayParamDTO;
+import com.czg.service.order.dto.VipMemberPayParamDTO;
+import com.czg.service.order.dto.VipPayParamDTO;
+import com.czg.service.order.dto.VipRefundDTO;
 import com.czg.service.order.enums.OrderStatusEnums;
 import com.czg.service.order.mapper.OrderPaymentMapper;
 import com.czg.service.order.service.PayService;
@@ -58,7 +58,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -722,12 +721,12 @@ public class PayServiceImpl implements PayService {
                 }
                 orderDetail.setRefundNo(refPayOrderNo);
                 orderDetail.setRefundRemark(orderDetail.getRefundRemark() + param.getRefundReason());
-                if (isPay) {
-                    orderDetail.setReturnAmount(refundDetail.getReturnAmount().add(refundDetail.getReturnAmount()));
+//                if (isPay) {
+                    orderDetail.setReturnAmount(orderDetail.getReturnAmount().add(refundDetail.getReturnAmount()));
                     if (orderDetail.getReturnAmount().compareTo(orderDetail.getPayAmount()) > 0) {
                         orderDetail.setReturnAmount(orderDetail.getPayAmount());
                     }
-                }
+//                }
                 orderDetailService.updateById(orderDetail);
                 if (orderDetail.getProductId() != null && orderDetail.getProductId() > 0) {
                     returnProMap.put(Convert.toStr(orderDetail.getProductId()), refundDetail.getNum());