From 87cf4e9c1b1275ba16c9f027cd501aa43fa888a7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 九月 2024 11:22:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
index 1ea0979..cb41922 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -361,9 +361,10 @@
         if(1 == paymentType){
             WxPaymentRefundModel model = new WxPaymentRefundModel();
             model.setOut_trade_no(shoppingOrder.getCode());
+            model.setTransaction_id(shoppingOrder.getSerialNumber());
             model.setOut_refund_no(shoppingOrderRefund.getRefundCode());
             model.setReason("取消订单");
-            model.setNotify_url("http://127.0.0.1:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");
+            model.setNotify_url("http://221.182.45.100:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");
             WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
             amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());
             amount.setTotal(shoppingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());

--
Gitblit v1.7.1