From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
index d38d967..ab74953 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
@@ -63,6 +63,9 @@
private ITUserService appUserService;
@Autowired
private IOrderCancelService orderCancelService;
+
+ @Autowired
+ private ITCompanyService companyService;
public static void main(String[] args) {
// 获取今天的日期
@@ -99,6 +102,8 @@
*/
@RequestMapping("/commission")
public String index( Model model) {
+ List<TCompany> tCompanies = companyService.selectList(new EntityWrapper<TCompany>().eq("state", 0).ne("flag", 3));
+ model.addAttribute("company", tCompanies);
return PREFIX + "commission.html";
}
@@ -117,7 +122,7 @@
*/
@RequestMapping(value = "/commission/getCount")
@ResponseBody
- public Object getCount(Integer time,String insertTime,Integer state) {
+ public Object getCount(Integer time,String insertTime,Integer state, Integer company) {
if (time == null){
time =1;
}
@@ -181,13 +186,13 @@
if (time == 5 && !StringUtils.hasLength(insertTime)){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType"));
}else{
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType")
.between("insertTime", start, end));
@@ -246,7 +251,9 @@
if (tOrderPrivateCar==null){
continue;
}
-
+ if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
+ continue;
+ }
platformVO.setMoney(new BigDecimal(income.getMoney()));
if (tOrderPrivateCar.getState()!=10 && tOrderPrivateCar.getPayType() == null){
continue;
@@ -268,7 +275,9 @@
if (tOrderLogistics==null){
continue;
}
-
+ if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
+ continue;
+ }
platformVO.setMoney(new BigDecimal(income.getMoney()));
if (tOrderLogistics.getState()!=10 && tOrderLogistics.getPayType() == null){
@@ -289,6 +298,9 @@
TOrderPrivateCar tOrderPrivateCar = orderPrivateCarMap.get(settlementDetail.getOrderId());
if (tOrderPrivateCar==null){
+ continue;
+ }
+ if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
continue;
}
platformVO.setCode(tOrderPrivateCar.getOrderNum());
@@ -329,6 +341,9 @@
TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(settlementDetail.getOrderId());
if (tOrderLogistics==null){
+ continue;
+ }
+ if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
continue;
}
String string1 = settlementDetail.getPrice().toString();
@@ -1716,7 +1731,7 @@
*/
@RequestMapping(value = "/commission/list")
@ResponseBody
- public Object list(Integer time,String insertTime,Integer state) {
+ public Object list(Integer time,String insertTime,Integer state, Integer company) {
if (time == null){
time =1;
@@ -1781,13 +1796,13 @@
if (time == 5 && !StringUtils.hasLength(insertTime)){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType"));
}else{
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType")
.between("insertTime", start, end));
@@ -1873,6 +1888,9 @@
if (tOrderPrivateCar==null){
continue;
}
+ if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
+ continue;
+ }
platformVO.setCode(tOrderPrivateCar.getOrderNum());
TDriver tDriver = driverMap.get(tOrderPrivateCar.getDriverId());
if (tDriver != null){
@@ -1941,6 +1959,9 @@
TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(income.getIncomeId());
if (tOrderLogistics==null){
+ continue;
+ }
+ if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
continue;
}
platformVO.setCode(tOrderLogistics.getOrderNum());
@@ -2012,6 +2033,10 @@
if (tOrderPrivateCar==null){
continue;
}
+
+ if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
+ continue;
+ }
platformVO.setCode(tOrderPrivateCar.getOrderNum());
TDriver tDriver = driverMap.get(tOrderPrivateCar.getDriverId());
if (tDriver!=null){
@@ -2058,6 +2083,10 @@
if (tOrderLogistics==null){
continue;
}
+
+ if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
+ continue;
+ }
platformVO.setCode(tOrderLogistics.getOrderNum());
TDriver tDriver1 = driverMap.get(tOrderLogistics.getDriverId());
if (tDriver1!=null){
--
Gitblit v1.7.1