From 378ee0f70e1eafdd7165aa1c6ec9f05a8071c1a8 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 26 十月 2023 11:07:15 +0800
Subject: [PATCH] 10.26.3
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 2ab0c81..97b1408 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,9 @@
query.setProvince(province);
query.setCity(city);
query.setStoreId(storeId);
+ if(UserExt.getUser().getObjectType()==3){
+ query.setStoreId(UserExt.getUser().getObjectId());
+ }
query.setRegisterTime(registerTime);
query.setUserName(userName);
query.setUserIds(Lists.newArrayList());
@@ -225,7 +228,7 @@
public String income(Model model) {
Integer objectType = UserExt.getUser().getObjectType();
model.addAttribute("roleType",objectType);
- return PREFIX + "income.html";
+ return PREFIX + "Income.html";
}
/**
* 获取收入管理列表
@@ -356,7 +359,10 @@
}
TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
- Store store = storeClient.getStoreById(Integer.valueOf(competition1.getStoreId().split(",")[0]));
+ if (!competition1.getStoreId().equals("")){
+ String[] split = competition1.getStoreId().split(",");
+ }
+ Store store = storeClient.getStoreById(Integer.valueOf(competition1.getStoreId()));
IncomeVO temp = new IncomeVO();
temp.setId(competition.getId().intValue());
temp.setProvince(tAppUser.getProvince());
@@ -601,6 +607,9 @@
coachQuery.setCoachName(coachName);
coachQuery.setCourseName(courseName);
coachQuery.setTime(beginTime);
+ if(UserExt.getUser().getObjectType()==3){
+ coachQuery.setStoreId(UserExt.getUser().getObjectId());
+ }
return cancelledClassesClient.listAll(coachQuery);
}
/**
@@ -614,6 +623,9 @@
query.setProvince(province);
query.setCity(city);
query.setStoreId(storeId);
+ if(UserExt.getUser().getObjectType()==3){
+ query.setStoreId(UserExt.getUser().getObjectId());
+ }
query.setRegisterTime(registerTime);
query.setUserName(userName);
query.setUserIds(Lists.newArrayList());
@@ -635,8 +647,9 @@
if (userIds.size()==0){
return new ArrayList<>();
}
+ List<RegisterOrderVO> registerOrderVOS = coursePackagePaymentClient.listAllRegister(query);
- return coursePackagePaymentClient.listAllRegister(query);
+ return registerOrderVOS;
}
--
Gitblit v1.7.1