From fcbf535248eac4883427232410ec6065b4cdcc83 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 06 十一月 2024 11:21:29 +0800
Subject: [PATCH] merge
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 3 ++-
1 files changed, 2 insertions(+), 1 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..89a24f0 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,12 +376,13 @@
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 R.ok();
}
--
Gitblit v1.7.1