From 25cf266e99714ac5d428e66b40ce272325c91dd8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 14 六月 2025 15:01:11 +0800
Subject: [PATCH] 修改管理后台账号和共享session等 屏蔽除出租车外的其他模块
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
index 371b26b..efd09df 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.ToolUtil;
@@ -227,9 +228,9 @@
endTime = split[1];
}
Map<String, Object> maps = new HashMap<>();
-
+
List<Map<String, Object>> datas = new ArrayList<>();
- List<Map<String, Object>> list2 = this.baseMapper.summaryOfIncomeDetailsListGroupSum1(1, ShiroKit.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, offset, limit);
+ List<Map<String, Object>> list2 = this.baseMapper.summaryOfIncomeDetailsListGroupSum1(1, ShiroExtUtil.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, offset, limit);
for (Map<String, Object> income : list2) {
Double orderMoney = Double.valueOf(null != income.get("orderMoney") ? income.get("orderMoney").toString() : "0");
Double payMoney = Double.valueOf(income.get("payMoney").toString());
@@ -317,7 +318,7 @@
}
List<Map<String, Object>> datas1 = new ArrayList<>();
- list2 = this.baseMapper.summaryOfIncomeDetailsListGroupSum1(1, ShiroKit.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, null, null);
+ list2 = this.baseMapper.summaryOfIncomeDetailsListGroupSum1(1, ShiroExtUtil.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, null, null);
for (Map<String, Object> income : list2) {
Double orderMoney = Double.valueOf(null != income.get("orderMoney") ? income.get("orderMoney").toString() : "0");
Double payMoney = Double.valueOf(income.get("payMoney").toString());
@@ -446,8 +447,8 @@
startTime = split[0];
endTime = split[1];
}
-
- List<Map<String, Object>> list = this.baseMapper.summaryOfIncomeDetailsListGroupSum1(1, ShiroKit.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, null, null);
+
+ List<Map<String, Object>> list = this.baseMapper.summaryOfIncomeDetailsListGroupSum1(1, ShiroExtUtil.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, null, null);
List<Map<String, Object>> datas = new ArrayList<>();
Integer num = 0;
@@ -568,15 +569,15 @@
public Map<String, Object> summaryOfSpendingDetailsList(String insertTime, Integer orderType, Integer incomeType, String name, String phone, Integer offset, Integer limit) throws Exception {
String startTime = "";
String endTime = "";
- if(ToolUtil.isNotEmpty(insertTime)){
+ if (ToolUtil.isNotEmpty(insertTime)) {
String[] split = insertTime.split(" - ");
startTime = split[0];
endTime = split[1];
}
Map<String, Object> maps = new HashMap<>();
-
- List<Map<String, Object>> list1 = this.baseMapper.summaryOfSpendingDetailsList1(ShiroKit.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, offset, limit);
- List<Map<String, Object>> list2 = this.baseMapper.summaryOfSpendingDetailsList1(ShiroKit.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, null, null);
+
+ List<Map<String, Object>> list1 = this.baseMapper.summaryOfSpendingDetailsList1(ShiroExtUtil.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, offset, limit);
+ List<Map<String, Object>> list2 = this.baseMapper.summaryOfSpendingDetailsList1(ShiroExtUtil.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, null, null);
BigDecimal orderRevenue = new BigDecimal("0");
BigDecimal activityAward = new BigDecimal("0");
BigDecimal other = new BigDecimal("0");
@@ -596,8 +597,8 @@
list1.add(map);
maps.put("rows", list1);
System.out.println("支出明细"+list1);
-
- list1 = this.baseMapper.summaryOfSpendingDetailsList1(ShiroKit.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, null, null);
+
+ list1 = this.baseMapper.summaryOfSpendingDetailsList1(ShiroExtUtil.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, null, null);
maps.put("total", list1.size());
return maps;
}
@@ -611,8 +612,8 @@
startTime = split[0];
endTime = split[1];
}
-
- List<Map<String, Object>> list1 = this.baseMapper.summaryOfSpendingDetailsList1(ShiroKit.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, null, null);
+
+ List<Map<String, Object>> list1 = this.baseMapper.summaryOfSpendingDetailsList1(ShiroExtUtil.getUser().getObjectId(), startTime, endTime, orderType, incomeType, name, phone, null, null);
String[] title = new String[]{"时间", "订单类型", "收益类型", "司机名称", "司机手机号", "订单应支付金额", "平台奖励支出", "其他支出", "支出合计"};
String[][] values = new String[list1.size()][9];
int n = 0;
--
Gitblit v1.7.1