From 3ca15fea872010606b5b96a4c11d0d6409dd0be7 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 18 九月 2023 18:09:05 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
index 45b8857..08929a3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
@@ -171,8 +171,8 @@
@GetMapping("/queryBill")
- public R<ProfitSharingResult> queryBill(String transactionId,String outOrderNo) throws WxPayException {
- ProfitSharingResult result = orderService.queryBill(transactionId,outOrderNo);
+ public R<ProfitSharingResult> queryBill(String orderId) throws WxPayException {
+ ProfitSharingResult result = orderService.queryBill(orderId);
return R.ok(result);
}
}
--
Gitblit v1.7.1