From 0b2d47ad50450876b3fd26db354e3021248da869 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 21 Sep 2025 19:53:40 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index 0e778f3..b0a11b2 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
@@ -162,9 +168,9 @@
     //一键用户平仓操作
     @RequestMapping({"allsell.do"})
     @ResponseBody
-    public ServerResponse allsell(@RequestParam("stockType") String positionSn,HttpServletRequest request) {
+    public ServerResponse allsell(HttpServletRequest request) {
         try {
-            return this.iUserPositionService.allSell(request,positionSn);
+            return this.iUserPositionService.allSell(request);
         } catch (Exception e) {
             return  ServerResponse.createByErrorMsg("Sell Fail",request);
         }
@@ -464,23 +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);
-    }
-
-    /**
-     * 代付回调通知
-     */
-    @PostMapping({"noticePayment.do"})
-    public void noticePayment(TradeResultVO vo,HttpServletResponse response) throws IOException {
-        iUserWithdrawService.noticePayment(vo,response);
-    }
-
-    /**
-     * 代付2回调通知
-     */
-    @PostMapping({"noticePaymentTwo.do"})
-    public void noticePaymentTwo(PaymentCallbackTwo vo,HttpServletResponse response) throws IOException {
-        iUserWithdrawService.noticePaymentTwo(vo,response);
     }
 }

--
Gitblit v1.9.3