From d33532187f3ec248cc279d6600a77a74e6e75097 Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Mon, 25 Aug 2025 23:02:07 +0800
Subject: [PATCH] 11

---
 src/main/java/com/nq/controller/agent/AgentController.java |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nq/controller/agent/AgentController.java b/src/main/java/com/nq/controller/agent/AgentController.java
index cae8335..f39142d 100644
--- a/src/main/java/com/nq/controller/agent/AgentController.java
+++ b/src/main/java/com/nq/controller/agent/AgentController.java
@@ -31,6 +31,8 @@
     @Autowired
     IAgentAgencyFeeService iAgentAgencyFeeService;
 
+    @Autowired
+    ISiteUserOptionLogService iSiteUserOptionLogService;
 
     @Autowired
     ISiteAdminService iSiteAdminService;
@@ -42,6 +44,12 @@
         return this.iAgentUserService.getAgentInfo(request);
     }
 
+    @RequestMapping("optionList.do")
+    @ResponseBody
+    public ServerResponse optionList(@RequestParam(value = "agentId", required = false) Integer agentId,@RequestParam(value = "userId", required = false) Integer userId, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize){
+        return this.iSiteUserOptionLogService.list(agentId,userId,pageNum,pageSize);
+    }
+
     //修改代理用户密码
     @RequestMapping({"updatePwd.do"})
     @ResponseBody
@@ -49,6 +57,19 @@
         return this.iAgentUserService.updatePwd(oldPwd, newPwd, request);
     }
 
+    //查询首页充值,提现,注册统计
+    @RequestMapping({"moneyCount.do"})
+    @ResponseBody
+    public ServerResponse moneyCount(@RequestParam(value = "agentId", required = false) String agentId,@RequestParam(value = "startTime", required = false) String startTime,@RequestParam(value = "entTime", required = false) String entTime) {
+        return this.iSiteAdminService.moneyCount(agentId,startTime,entTime);
+    }
+
+    //查询代理总资金
+    @RequestMapping({"totalAgencyFunds.do"})
+    @ResponseBody
+    public ServerResponse totalAgencyFunds(@RequestParam(value = "agentId", required = false) String agentId) {
+        return this.iSiteAdminService.totalAgencyFunds(agentId);
+    }
 
     //查询首页 资金情况、持仓情况、盈亏信息、提现情况、股票信息、代理信息
     @RequestMapping({"count.do"})
@@ -82,8 +103,8 @@
     //添加用户管理 账户信息
     @RequestMapping({"addSimulatedAccount.do"})
     @ResponseBody
-    public ServerResponse addSimulatedAccount(HttpServletRequest request,@RequestParam("agentId") Integer agentId, @RequestParam("phone") String phone, @RequestParam("amt") String amt, @RequestParam("accountType") Integer accountType, @RequestParam("pwd") String pwd) {
-        return this.iUserService.addSimulatedAccount(agentId, phone, pwd, amt, accountType, request);
+    public ServerResponse addSimulatedAccount(HttpServletRequest request,@RequestParam("agentId") Integer agentId, @RequestParam("phone") String phone, @RequestParam("accountType") Integer accountType, @RequestParam("pwd") String pwd) {
+        return this.iUserService.addSimulatedAccount(agentId, phone, pwd, accountType, request);
     }
 
     //查询股票统计指定时间内,代理客户(已平仓)的交易盈亏
@@ -130,4 +151,12 @@
         }
         return this.iAgentUserService.updateOnlineServices(onLineServices,agentId);
     }
+
+
+    @RequestMapping("getMoney.do")
+    @ResponseBody
+    public  ServerResponse getMoney(
+            @RequestParam("userId") Integer id){
+        return  iUserService.getMoney(id);
+    }
 }

--
Gitblit v1.9.3