From e9d4746af2164d4dbff94bd7736b28072b44fc57 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 十一月 2024 17:28:18 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 89a24f0..42be27c 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
@@ -373,17 +373,14 @@
req.setSubject("购买商品");
req.setBuyerOpenId(user.getAliOpenid());
req.setBody("购买商品");
+ req.setNotifyUrl("/payment/callBack/ali/all");
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();
-
+ return AjaxResult.success();
}
--
Gitblit v1.7.1