From 6ec6f5336755da695378850d9fd960f6498a20e3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 06 十一月 2024 16:02:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
index 330b67d..a6d2e71 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -376,6 +376,7 @@
             AliPaymentResp data = aliPaymentClient.payment(req).getData();
             if(null != data){
                 data.setNotifyUrl(data.getNotifyUrl() + "/payment/callBack/ali/all");
+                data.setOrderId(shopOrder.getId().toString());
                 return AjaxResult.success(data);
             }
         }

--
Gitblit v1.7.1