From b7ef37cebb85e45006170422b67d74c357b89540 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 20 May 2024 17:53:22 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/SiteAdminServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++
src/main/java/com/nq/service/impl/StockServiceImpl.java | 3 +++
src/main/java/com/nq/controller/backend/AdminController.java | 8 ++++++++
src/main/java/com/nq/pojo/UserWithdraw.java | 2 ++
src/main/java/com/nq/dao/UserWithdrawMapper.java | 4 +++-
src/main/java/com/nq/service/ISiteAdminService.java | 2 ++
6 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nq/controller/backend/AdminController.java b/src/main/java/com/nq/controller/backend/AdminController.java
index 177950f..049413a 100644
--- a/src/main/java/com/nq/controller/backend/AdminController.java
+++ b/src/main/java/com/nq/controller/backend/AdminController.java
@@ -16,6 +16,7 @@
import com.nq.utils.PropertiesUtil;
+import java.util.Date;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -111,6 +112,13 @@
return this.iSiteAdminService.count();
}
+ //查询首页 资金情况、持仓情况、盈亏信息、提现情况、股票信息、代理信息
+ @RequestMapping({"moneyCount.do"})
+ @ResponseBody
+ public ServerResponse moneyCount(@RequestParam(value = "startTime", required = false) String startTime,@RequestParam(value = "entTime", required = false) String entTime) {
+ return this.iSiteAdminService.moneyCount(startTime,entTime);
+ }
+
//处理图片上传
@RequestMapping({"upload.do"})
@ResponseBody
diff --git a/src/main/java/com/nq/dao/UserWithdrawMapper.java b/src/main/java/com/nq/dao/UserWithdrawMapper.java
index a30197b..d9b5348 100644
--- a/src/main/java/com/nq/dao/UserWithdrawMapper.java
+++ b/src/main/java/com/nq/dao/UserWithdrawMapper.java
@@ -1,11 +1,13 @@
package com.nq.dao;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.nq.pojo.UserRecharge;
import com.nq.pojo.UserWithdraw;
import java.math.BigDecimal;
import java.util.List;
import org.apache.ibatis.annotations.Param;
-public interface UserWithdrawMapper {
+public interface UserWithdrawMapper extends BaseMapper<UserWithdraw> {
int deleteByPrimaryKey(Integer paramInteger);
int insert(UserWithdraw paramUserWithdraw);
diff --git a/src/main/java/com/nq/pojo/UserWithdraw.java b/src/main/java/com/nq/pojo/UserWithdraw.java
index 397b63a..98a51e7 100644
--- a/src/main/java/com/nq/pojo/UserWithdraw.java
+++ b/src/main/java/com/nq/pojo/UserWithdraw.java
@@ -1,6 +1,7 @@
package com.nq.pojo;
import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
@@ -41,6 +42,7 @@
@Excel(name = "原因")
private String withMsg;
+ @TableField(exist = false)
private String userPhone;
diff --git a/src/main/java/com/nq/service/ISiteAdminService.java b/src/main/java/com/nq/service/ISiteAdminService.java
index 7b185bf..50ada25 100644
--- a/src/main/java/com/nq/service/ISiteAdminService.java
+++ b/src/main/java/com/nq/service/ISiteAdminService.java
@@ -27,4 +27,6 @@
ServerResponse count();
ServerResponse deleteAdmin(Integer adminId);
+
+ ServerResponse moneyCount(String startTime, String entTime);
}
diff --git a/src/main/java/com/nq/service/impl/SiteAdminServiceImpl.java b/src/main/java/com/nq/service/impl/SiteAdminServiceImpl.java
index 4b8abe0..fb4db27 100644
--- a/src/main/java/com/nq/service/impl/SiteAdminServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteAdminServiceImpl.java
@@ -1,5 +1,6 @@
package com.nq.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.nq.dao.SiteAdminMapper;
import com.github.pagehelper.PageHelper;
@@ -15,6 +16,7 @@
import com.nq.pojo.UserRecharge;
+import com.nq.pojo.UserWithdraw;
import com.nq.service.IAgentUserService;
import com.nq.service.ISiteAdminService;
@@ -43,7 +45,9 @@
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -102,6 +106,9 @@
@Resource
UserMapper userMapper;
+
+ @Autowired
+ UserWithdrawMapper userWithdrawMapper;
public ServerResponse login(String adminPhone, String adminPwd, String verifyCode, HttpServletRequest request) {
@@ -369,6 +376,33 @@
}
+ @Override
+ public ServerResponse moneyCount(String startTime, String entTime) {
+ BigDecimal rechargeTotalAmount = BigDecimal.ZERO;
+ BigDecimal withdrawalTotalAmount = BigDecimal.ZERO;
+
+ List<UserRecharge> userRecharges = userRechargeMapper.selectList(new LambdaQueryWrapper<UserRecharge>().eq(UserRecharge::getOrderStatus, 1)
+ .ge(StringUtils.isNotBlank(startTime), UserRecharge::getPayTime, startTime)
+ .le(StringUtils.isNotBlank(entTime), UserRecharge::getPayTime, entTime));
+ List<UserWithdraw> userWithdraws = userWithdrawMapper.selectList(new LambdaQueryWrapper<UserWithdraw>().eq(UserWithdraw::getWithStatus, 1)
+ .ge(StringUtils.isNotBlank(startTime), UserWithdraw::getTransTime, startTime)
+ .le(StringUtils.isNotBlank(entTime), UserWithdraw::getTransTime, entTime));
+
+ for (UserRecharge userRecharge : userRecharges) {
+ rechargeTotalAmount = rechargeTotalAmount.add(userRecharge.getPayAmt());
+ }
+
+ for (UserWithdraw userWithdraw : userWithdraws) {
+ withdrawalTotalAmount = withdrawalTotalAmount.add(userWithdraw.getWithAmt());
+ }
+
+ Map<String, BigDecimal> map = new HashMap<>();
+ map.put("rechargeTotalAmount", rechargeTotalAmount);
+ map.put("withdrawalTotalAmount", withdrawalTotalAmount);
+ return ServerResponse.createBySuccess(map);
+ }
+
+
public SiteAdmin findAdminByName(String name) {
return this.siteAdminMapper.findAdminByName(name);
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index a34dd69..cfc0387 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -150,6 +150,9 @@
dzStock.setStockType(stockDz.getStockType());
stockList.add(dzStock);
}
+ }else {
+ PageHelper.startPage(pageNum, pageSize);
+ stockList.addAll(stockMapper.findStockListByKeyWords(keyWords, stockPlate, stockType, Integer.valueOf(0), pageNum - 1, pageSize));
}
List<StockListVO> stockListVOS = Lists.newArrayList();
--
Gitblit v1.9.3