From b864ea85f84cee2df8616f4eb5757f5f3f1a5c43 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 19 Jan 2026 15:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.11rg' into 1.11rg
---
src/main/java/com/nq/controller/agent/AgentController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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..7b86f6f 100644
--- a/src/main/java/com/nq/controller/agent/AgentController.java
+++ b/src/main/java/com/nq/controller/agent/AgentController.java
@@ -38,7 +38,7 @@
//查询指定代理信息
@RequestMapping({"getAgentInfo.do"})
@ResponseBody
- public ServerResponse getAgentInfo(HttpServletRequest request) {
+ public ServerResponse getAgentInfo(HttpServletRequest request) throws Exception {
return this.iAgentUserService.getAgentInfo(request);
}
@@ -97,6 +97,13 @@
return this.iUserPositionService.getIncome(agentId, positionType, beginTime, endTime);
}
+ //查询首页充值，提现，注册统计
+ @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({"getIndexIncome.do"})
@ResponseBody
@@ -130,4 +137,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