From 2ed572d6b2a4be6b91b3e2a1ed48485abde91553 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 15 Jul 2024 10:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into rb-copy
---
src/main/java/com/nq/controller/backend/AdminController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nq/controller/backend/AdminController.java b/src/main/java/com/nq/controller/backend/AdminController.java
index 632a2f2..43119dc 100644
--- a/src/main/java/com/nq/controller/backend/AdminController.java
+++ b/src/main/java/com/nq/controller/backend/AdminController.java
@@ -13,6 +13,7 @@
import com.nq.utils.PropertiesUtil;
+import java.util.Date;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -68,6 +69,10 @@
@Autowired
IUserAssetsServices iUserAssetsServices;
+
+ @Autowired
+ IApplyLeverServices iApplyLeverServices;
+
@Autowired
IApplyLeverServices iApplyLeverServices;
@@ -131,6 +136,20 @@
@ResponseBody
public ServerResponse count() {
return this.iSiteAdminService.count();
+ }
+
+ //查询首页充值，提现，注册统计
+ @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);
}
//处理图片上传
@@ -244,13 +263,15 @@
@RequestParam("edesc") String desc,
@RequestParam("isOpen") String isOpen,
@RequestParam("returnTime") String returnTime,
- @RequestParam("title") String title){
+ @RequestParam("title") String title,
+ @RequestParam("buyLowestNum") Integer buyLowestNum){
EChoBean eChoBean = new EChoBean();
eChoBean.setEdesc(desc);
eChoBean.setIsOpen(isOpen);
eChoBean.setReturnTime(returnTime);
eChoBean.setTitle(title);
eChoBean.setReturnOfRate(returnOfRate);
+ eChoBean.setBuyLowestNum(buyLowestNum);
if(iEchoServices.insertEcho(eChoBean) >= 1){
return ServerResponse.createBySuccess();
}else{
@@ -269,8 +290,9 @@
@RequestParam("isOpen") String isOpen,
@RequestParam("returnTime") String returnTime,
@RequestParam("title") String title,
- @RequestParam("id") Integer id
- ){
+ @RequestParam("id") Integer id,
+ @RequestParam("buyLowestNum") Integer buyLowestNum
+ ){
EChoBean eChoBean = new EChoBean();
eChoBean.setId(id);
eChoBean.setEdesc(desc);
@@ -278,6 +300,7 @@
eChoBean.setReturnTime(returnTime);
eChoBean.setTitle(title);
eChoBean.setReturnOfRate(returnOfRate);
+ eChoBean.setBuyLowestNum(buyLowestNum);
if(iEchoServices.updateEcho(eChoBean) >= 1){
return ServerResponse.createBySuccess();
}else{
@@ -375,4 +398,22 @@
return iUserAssetsServices.updateUserAssets(id,amt,type);
}
+ @RequestMapping({"examineApplyLever.do"})
+ @ResponseBody
+ public ServerResponse examineApplyLever(@RequestParam(value = "id", required = true) String id,
+ @RequestParam(value = "state", defaultValue = "1") String state,
+ HttpServletRequest request) {
+ return this.iApplyLeverServices.examineApplyLever(id,state,request);
+ }
+
+
+ @RequestMapping({"queryApplyLever.do"})
+ @ResponseBody
+ public ServerResponse queryApplyLever(@RequestParam(value = "phone", required = false) String adminName,
+ @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
+ HttpServletRequest request
+ ) {
+ return this.iApplyLeverServices.queryApplyLever(adminName,pageNum,pageSize, request);
+ }
}
--
Gitblit v1.9.3