From c96b05ab329834d16ec2aad7a35e66dfa02511c1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:40:34 +0800
Subject: [PATCH] #获取正常还车

---
 server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
index e472eb2..a99eba4 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -38,7 +38,7 @@
     private TransactionsMapper transactionsMapper;
 
 
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
     public Refund wxRefund(RefundDTO refundDTO) {
         try {
             // 鍙戦�侀��娆捐姹�
@@ -48,6 +48,10 @@
             request.setOutRefundNo(refNum);
             request.setTotalFee(BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
             request.setRefundFee(BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
+            System.out.println("瀹為檯鎬婚噾棰�" + BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
+            System.out.println("瀹為檯閫�娆鹃噾棰�" + BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
+//            request.setTotalFee(1);
+//            request.setRefundFee(1);
             WxPayRefundResult response = WxMiniConfig.wxPayService.refund(request);
             if ("SUCCESS".equals(response.getReturnCode()) && "SUCCESS".equals(response.getResultCode())) {
                 //瀛樺偍閫�娆捐褰� 涓� 娴佹按璁板綍
@@ -58,7 +62,9 @@
                 refund.setMoney(refundDTO.getRefundAmount());
                 refund.setOnlineOrderid(refNum);
                 refund.setPayWay(Constants.ZERO);
+                refund.setStatus(Constants.TWO);
                 refund.setDoneDate(new Date());
+                refund.setCreator(refundDTO.getCreator());
                 refund.setType(refundDTO.getType());
                 refund.setObjId(refundDTO.getOrderId());
                 refund.setReason(refundDTO.getReason());

--
Gitblit v1.9.3