From 3a8764d068b83988fa4c5f61abc4ba359e5aeb29 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 16 Sep 2025 19:45:36 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/controller/protol/UserController.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index bfa4713..db32f74 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -108,6 +108,12 @@
         return this.iUserService.getMoney(request);
     }
 
+    @RequestMapping("getWeeklyProfit.do")
+    @ResponseBody
+    public ServerResponse getWeeklyProfit( HttpServletRequest request) {
+        return this.iUserService.getWeeklyProfit(request);
+    }
+
     //查询用户自选股
     @RequestMapping({"queryMyOption.do"})
     @ResponseBody
@@ -464,7 +470,21 @@
      * 充值2异步接收地址
      */
     @PostMapping({"rechargeCallbackTwo.do"})
-    public void rechargeCallbackTwo(TransactionStatusVo vo, HttpServletResponse response) throws IOException {
+    public void rechargeCallbackTwo(@RequestParam("status") String status,
+                                    @RequestParam("merchantid") String merchantid,
+                                    @RequestParam("out_trade_no") String outTradeNo,
+                                    @RequestParam("total_fee") String totalFee,
+                                    @RequestParam("poundage") String poundage,
+                                    @RequestParam("account_fee") String accountFee,
+                                    @RequestParam("sign") String sign, HttpServletResponse response) throws IOException {
+        TransactionStatusVo vo = new TransactionStatusVo();
+        vo.setStatus(status);
+        vo.setMerchantid(merchantid);
+        vo.setOut_trade_no(outTradeNo);
+        vo.setTotal_fee(totalFee);
+        vo.setPoundage(poundage);
+        vo.setAccount_fee(accountFee);
+        vo.setSign(sign);
         payService.rechargeCallbackTwo(vo,response);
     }
 }

--
Gitblit v1.9.3