From 594c99b4dc2738cad1711d41418882ce8178993d Mon Sep 17 00:00:00 2001
From: wyn <1074145239@qq.com>
Date: Thu, 30 Apr 2026 19:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/book/controller/BuyOrderController.java  |  8 +++++++-
 .../modules/pay/refund/entity/PayRefundOrder.java    |  7 +++++--
 .../pay/weChatPay/service/impl/WxpayServiceImpl.java | 12 ++++++++----
 src/main/resources/logback-spring.xml                |  3 ++-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
index 32f2194..3518470 100644
--- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
@@ -41,6 +41,7 @@ import com.peanut.modules.pay.weChatPay.service.WxpayService;
 import com.peanut.modules.sys.entity.SysConfigEntity;
 import com.peanut.modules.sys.service.SysConfigService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpException;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -676,6 +677,7 @@ public class BuyOrderController {
         }
         //设置状态为已退款
         buyOrder.setOrderStatus(Constants.ORDER_STATUS_REFUNDING);
+        buyOrderService.updateById(buyOrder);
 
         BigDecimal refundFee = buyOrder.getRealMoney();
         BigDecimal shippingMoney = buyOrder.getShippingMoney()==null?BigDecimal.ZERO:buyOrder.getShippingMoney();
@@ -742,7 +744,11 @@ public class BuyOrderController {
                 } else if (buyOrder.getCome()==4) {
                     weChatRefundInfo.setAppName("thyy");
                 }
-                wxpayService.refund(weChatRefundInfo);
+                try {
+                    wxpayService.refund(weChatRefundInfo);
+                } catch (Exception e) {
+                    System.out.println("msg=" + e.getMessage()); // 👈 关键
+                }
             }
         }
 //        else if (Constants.PAYMENT_METHOD_ALI_PAY.equals(buyOrder.getPaymentMethod())) {
diff --git a/src/main/java/com/peanut/modules/pay/refund/entity/PayRefundOrder.java b/src/main/java/com/peanut/modules/pay/refund/entity/PayRefundOrder.java
index 0116285..eb79ff8 100644
--- a/src/main/java/com/peanut/modules/pay/refund/entity/PayRefundOrder.java
+++ b/src/main/java/com/peanut/modules/pay/refund/entity/PayRefundOrder.java
@@ -19,7 +19,9 @@ public class PayRefundOrder implements Serializable {
 
 
     @TableId
-    private Integer refundId;
+    private Integer id;
+
+    private String refundId;
 
     /**
      * 支付方式   1微信，2支付宝，3虚拟币
@@ -29,8 +31,9 @@ public class PayRefundOrder implements Serializable {
     /**
      * BuyOrder
      */
-    private Integer orderId;
+    private String orderSn;
 
+    private Integer orderId;
     /**
      * 微信支付宝订单号
      */
diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
index 88b2cff..7d7a316 100644
--- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
+++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
@@ -369,7 +369,7 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
         // 这里 * 100，微信支付单位为 ‘分’
         BigDecimal hand = new BigDecimal("100");
         Map<String, Object> amountMap = new HashMap<>();
-        amountMap.put("refund", refund.multiply(hand));
+        amountMap.put("refund", refund.multiply(hand).intValue());
         amountMap.put("total", total.multiply(hand).intValue());
         amountMap.put("currency", "CNY");
         paramMap.put("amount", amountMap);
@@ -392,14 +392,18 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
             appid = wechatPayConfig.getThyyappId();
         }
         // app id
-        paramMap.put("appid", appid);
+//        paramMap.put("appid", appid);
 
         String notify_url = wechatPayConfig.getRefundNotifyUrl();
         String mchName = "";
+
+        String mchid = wechatPayConfig.getMchId();
         if ("trainingClass".equals(refundInfo.getOrderType())||"lsorder".equals(refundInfo.getOrderType())) {
             mchName = "LS";
+            mchid =  wechatPayConfig.getLsMchId();
             notify_url = wechatPayConfig.getLsRefundNotifyUrl();
         }
+//        paramMap.put("mchid", mchid);
         paramMap.put("notify_url", notify_url);
 
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(paramMap));
@@ -470,9 +474,9 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
 
             PayRefundOrder refund = new PayRefundOrder();
             refund.setPayType("1");
-            refund.setOrderId(order.getOrderId());
+            refund.setRefundId(resourceMap.get("refund_id").toString());
             refund.setTradeNo(resourceMap.get("transaction_id").toString());
-            refund.setOutTradeNo(resourceMap.get("out_trade_no").toString());
+            refund.setOrderSn(resourceMap.get("out_trade_no").toString());
             refund.setRefundFee(((Map)resourceMap.get("amount")).get("refund").toString());
             refundOrderService.save(refund);
 
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index f941ed0..1b285e2 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -210,8 +210,9 @@
 
     <!--    &lt;!&ndash; 4.2 生产环境:输出到文档&ndash;&gt;-->
     <springProfile name="test,prod">
-        <logger name="com.peanut" level="ERROR" additivity="false">
+        <logger name="com.peanut" level="INFO" additivity="false">
 <!--            <appender-ref ref="DEBUG_FILE"/>-->
+            <appender-ref ref="INFO_FILE"/>
             <appender-ref ref="ERROR_FILE"/>
         </logger>
         <root level="info">