From dc75a139edc58a71bbbd8b94ed94287b7f3727fe Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 十一月 2024 14:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 9a46c41..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,13 +376,11 @@
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);
}
}
-
-
-
-
+ return AjaxResult.success();
}
--
Gitblit v1.7.1