From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
index 32a4d46..98ae1de 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
@@ -148,6 +148,7 @@
query.setProvince(province);
query.setCity(city);
query.setStoreId(storeId);
+ query.setInsertType(UserExt.getUser().getObjectType());
if(UserExt.getUser().getObjectType()==2){
List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>()
.eq("operatorId", UserExt.getUser().getObjectId())).stream()
@@ -247,6 +248,12 @@
RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery();
// 报名课程查询query
RegisterOrderQuery query = new RegisterOrderQuery();
+ query.setInsertType(UserExt.getUser().getObjectType());
+ if(UserExt.getUser().getObjectType()==2){
+ query.setStoresIds(storeService.list(new QueryWrapper<TStore>()
+ .eq("operatorId",UserExt.getUser().getObjectId())
+ ).stream().map(TStore::getId).collect(Collectors.toList()));
+ }
// 赛事活动查询query
CompetitionQuery competitionQuery = new CompetitionQuery();
// 会员支付查询query
@@ -404,6 +411,9 @@
IncomeVO temp = new IncomeVO();
TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
+ if(null == competition1){
+ continue;
+ }
if (!competition1.getStoreId().equals("")){
String[] split = competition1.getStoreId().split(",");
List<Integer> list = new ArrayList<>();
@@ -490,6 +500,10 @@
RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery();
// 报名课程查询query
RegisterOrderQuery query = new RegisterOrderQuery();
+ query.setInsertType(UserExt.getUser().getObjectType());
+ query.setStoresIds(storeService.list(new QueryWrapper<TStore>()
+ .eq("operatorId",UserExt.getUser().getObjectId()))
+ .stream().map(TStore::getId).collect(Collectors.toList()));
// 赛事活动查询query
CompetitionQuery competitionQuery = new CompetitionQuery();
// 会员支付查询query
@@ -652,6 +666,9 @@
IncomeVO temp = new IncomeVO();
TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
+ if(null == competition1){
+ continue;
+ }
if (!competition1.getStoreId().equals("")){
String[] split = competition1.getStoreId().split(",");
List<Integer> list = new ArrayList<>();
@@ -758,6 +775,13 @@
if(UserExt.getUser().getObjectType()==3){
coachQuery.setStoreId(UserExt.getUser().getObjectId());
}
+ if(UserExt.getUser().getObjectType()==2){
+ // 运营商门店ids
+ List<Integer> storeIds = storeService
+ .list(new QueryWrapper<TStore>().eq("operatorId", UserExt.getUser().getObjectId()))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ coachQuery.setStoreIds(storeIds);
+ }
return cancelledClassesClient.listAll(coachQuery);
}
/**
@@ -773,6 +797,7 @@
query.setProvince(province);
query.setCity(city);
query.setStoreId(storeId);
+ query.setInsertType(UserExt.getUser().getObjectType());
if(UserExt.getUser().getObjectType()==2){
query.setStoresIds(storeService.list(new QueryWrapper<TStore>()
.eq("operatorId",UserExt.getUser().getObjectId())
--
Gitblit v1.7.1