From aa45df63fa01b2f010560e4157f00bec5150a1fb Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:08:15 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 85 ++++++++++++++++++++++++++++++++----------
1 files changed, 64 insertions(+), 21 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
index 29f5cb4..645571c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -14,8 +14,11 @@
import com.dsh.course.feignClient.course.*;
import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.course.feignClient.course.model.TCoursePackagePayment;
+import com.dsh.course.feignClient.other.BallClient;
import com.dsh.course.feignClient.other.SiteClient;
import com.dsh.course.feignClient.other.StoreClient;
+import com.dsh.course.feignClient.other.model.GameDataQuery;
+import com.dsh.course.feignClient.other.model.TGameRecord;
import com.dsh.course.model.MoneyBack;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
@@ -88,6 +91,8 @@
private CoursePackageClient coursePackageClient;
@Autowired
private TOperatorService operatorService;
+ @Autowired
+ private BallClient ballClient;
/**
* 跳转到平台统计数据页面
*/
@@ -95,15 +100,9 @@
public String index(Model model) {
Object o = type1(null);
model.addAttribute("data",o);
-
-
-
// 教学统计
HashMap<String, Object> map = appUserClient.queryUserAge();
model.addAttribute("stuData",map);
-
-
-
return PREFIX + "platformIncome.html";
}
@@ -124,6 +123,8 @@
IncomeQuery incomeQuery = new IncomeQuery();
// 场地预约记录查询query
SiteBookingQuery siteBookingQuery = new SiteBookingQuery();
+ // 智慧球场查询query
+ GameDataQuery gameDataQuery = new GameDataQuery();
// 筛选运营商的是时候使用
List<Integer> storeIds = new ArrayList<>();
// 根据运营商ID 查询运营商下的所有门店
@@ -156,8 +157,8 @@
List<VipPayment> vipPayments = vipPaymentClient.registrationList(incomeQuery);
for (VipPayment vipPayment : vipPayments) {
IncomeVO temp = new IncomeVO();
- if (vipPayment.getPayStatus()==1){
- temp.setInsertTime(vipPayment.getInsertTime());
+ if (vipPayment.getState()!=3){
+ temp.setInsertTime(vipPayment.getPayTime());
incomeVOS.add(temp);
}
if (vipPayment.getAmount() != null) {
@@ -168,14 +169,13 @@
List<RechargeRecordsVO> rechargeRecordsVOS = financeClient.rechargeList(rechargeRecordsQuery);
for (RechargeRecordsVO rechargeRecordsVO : rechargeRecordsVOS) {
IncomeVO temp = new IncomeVO();
- temp.setInsertTime(rechargeRecordsVO.getInsertTime());
+ temp.setInsertTime(rechargeRecordsVO.getPayTime());
if (rechargeRecordsVO.getAmount() != null) {
temp.setAmount(rechargeRecordsVO.getAmount());
}
- if (rechargeRecordsVO.getPayStatus() ==1){
+ if (rechargeRecordsVO.getState() !=3){
incomeVOS.add(temp);
}
-
}
// 报名课程记录
List<RegisterOrderVO> registerOrderVOS = coursePackagePaymentClient.listAllRegister(query);
@@ -193,7 +193,6 @@
}
}
// query权限设置 获取运营商下的门店集合
-
if (roleType==2){
competitionQuery.setOperatorId(UserExt.getUser().getObjectId());
}
@@ -206,8 +205,9 @@
if (competition.getPayType()==3 || competition.getPayType()==4){
continue;
}
+ if (competition.getState()==3)continue;
IncomeVO temp = new IncomeVO();
- temp.setInsertTime(competition.getInsertTime());
+ temp.setInsertTime(competition.getPayTime());
if (competition.getAmount() != null) {
temp.setAmount(new BigDecimal(competition.getAmount().toString()));
}
@@ -220,9 +220,10 @@
List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
for (SiteBooking siteBooking : siteBookings) {
IncomeVO temp = new IncomeVO();
- if(siteBooking.getStatus()!=3){
+ if(siteBooking.getStatus()==0 || siteBooking.getStatus()==5){
continue;
}
+ if (siteBooking.getPayType() ==3 || siteBooking.getPayType() ==4)continue;
temp.setInsertTime(siteBooking.getPayTime());
if (siteBooking.getPayMoney() != null) {
temp.setAmount(new BigDecimal(siteBooking.getPayMoney().toString()));
@@ -239,6 +240,39 @@
temp.setInsertTime(pointMerchandiseIncomeVo.getInsertTime());
if (pointMerchandiseIncomeVo.getCash()!=null){
temp.setAmount(pointMerchandiseIncomeVo.getCash());
+ incomeVOS.add(temp);
+ }
+ }
+ // 平台智慧球场
+ if (storeId==null&&operatorId==null){
+ gameDataQuery.setObjectId(0);
+ List<TGameRecord> data = ballClient.getData(gameDataQuery);
+ for (TGameRecord datum : data) {
+ IncomeVO temp = new IncomeVO();
+ temp.setAmount(datum.getMoney());
+ temp.setInsertTime(datum.getTime());
+ incomeVOS.add(temp);
+ }
+ }
+ // 运营商
+ if (operatorId!=null && storeId==null){
+ gameDataQuery.setObjectId(operatorId);
+ List<TGameRecord> data = ballClient.getData(gameDataQuery);
+ for (TGameRecord datum : data) {
+ IncomeVO temp = new IncomeVO();
+ temp.setAmount(datum.getMoney());
+ temp.setInsertTime(datum.getTime());
+ incomeVOS.add(temp);
+ }
+ }
+ // 门店
+ if (storeId!=null){
+ gameDataQuery.setStoreId(storeId);
+ List<TGameRecord> data = ballClient.getData(gameDataQuery);
+ for (TGameRecord datum : data) {
+ IncomeVO temp = new IncomeVO();
+ temp.setAmount(datum.getMoney());
+ temp.setInsertTime(datum.getTime());
incomeVOS.add(temp);
}
}
@@ -1262,7 +1296,6 @@
// 会员费
HashMap<String, Object> map1 = appUserClient.queryFee(queryDataFee);
Object fee1 = map1.get("fee1");
-
map.put("fee1",fee1);
//玩湃比
Object fee2 = map1.get("fee2");
@@ -1272,12 +1305,9 @@
map.put("fee3",map3.get("fee"));
Object data = map3.get("data");
map.put("courseData",data);
-
-
// 赛事收入
Double aDouble1 = competitionClient.queryFee(queryDataFee);
map.put("fee4",aDouble1);
-
// 订场
if(ids.size()==0){
ids.add(-1);
@@ -1291,15 +1321,28 @@
if(userIds.size()==0){
userIds.add(-1);
}
- vipPaymentLambdaQueryWrapper.in(SiteBooking::getAppUserId,userIds);
vipPaymentLambdaQueryWrapper.ne(SiteBooking::getStatus,0);
+ vipPaymentLambdaQueryWrapper.ne(SiteBooking::getStatus,5);
ArrayList<Integer> objects = new ArrayList<>();
objects.add(1);
objects.add(2);
vipPaymentLambdaQueryWrapper.in(SiteBooking::getPayType,objects);
- List<SiteBooking> list1 = siteBookingService.list(vipPaymentLambdaQueryWrapper);
+ List<SiteBooking> list1 = siteBookingService.list(new QueryWrapper<SiteBooking>()
+ .ne("status",0)
+ .ne("status",5)
+ .ne("payType",3)
+ .ne("payType",4));
double sum = list1.stream().mapToDouble(SiteBooking::getPayMoney).sum();
- map.put("fee5",sum);
+ // 智慧球场查询query
+ GameDataQuery gameDataQuery = new GameDataQuery();
+ gameDataQuery.setObjectId(0);
+ // 平台智慧球场
+ List<TGameRecord> data1 = ballClient.getData(gameDataQuery);
+ double sum1 = data1.stream()
+ .map(TGameRecord::getMoney) // 获取每个 TGameRecord 对象的 money 字段
+ .mapToDouble(BigDecimal::doubleValue) // 将 BigDecimal 转换为 double
+ .sum();
+ map.put("fee5",sum+sum1);
List<Integer> collect = list1.stream().map(SiteBooking::getSiteId).collect(Collectors.toList());
--
Gitblit v1.7.1