From 6404cb07e5281cfd901267c4fd560ba89bd5e2fd Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Sep 2024 16:49:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ysz' into ysz

---
 src/main/java/com/nq/controller/backend/AdminRechargeController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nq/controller/backend/AdminRechargeController.java b/src/main/java/com/nq/controller/backend/AdminRechargeController.java
index 9fd6e03..f0640b0 100644
--- a/src/main/java/com/nq/controller/backend/AdminRechargeController.java
+++ b/src/main/java/com/nq/controller/backend/AdminRechargeController.java
@@ -94,8 +94,12 @@
     //创建资金管理 充值订单
     @RequestMapping({"createOrder.do"})
     @ResponseBody
-    public ServerResponse createOrder(@RequestParam(value = "userId", required = false) Integer userId, @RequestParam(value = "state", required = false) Integer state, @RequestParam(value = "amt", required = false) Integer amt, @RequestParam(value = "payChannel", required = false) String payChannel) {
-        return this.iUserRechargeService.createOrder(userId, state, amt, payChannel);
+    public ServerResponse createOrder(@RequestParam(value = "userId", required = false) Integer userId,
+                                      @RequestParam(value = "state", required = false) Integer state,
+                                      @RequestParam(value = "amt", required = false) Integer amt,
+                                      @RequestParam(value = "accountType", required = true) String accountType,
+                                      @RequestParam(value = "payChannel", required = false) String payChannel) {
+        return this.iUserRechargeService.createOrder(userId, state, amt, payChannel,accountType);
     }
 
     //删除资金管理 充值列表订单信息

--
Gitblit v1.9.3