From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 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 efd09df..5ab2901 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
@@ -1,18 +1,17 @@
package com.stylefeng.guns.modular.system.service.impl;
-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;
import com.stylefeng.guns.modular.system.dao.IncomeMapper;
-import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.model.Income;
import com.stylefeng.guns.modular.system.service.*;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
@@ -35,17 +34,19 @@
@Autowired
private ITOrderCallService orderCallService;
-
+
@Autowired
private ITUserService userService;
-
+
@Autowired
private ITOrderCharteredCarService orderCharteredCarService;
-
+
@Autowired
private ITDriverService driverService;
-
-
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
+
/**
* 添加数据
* @param userType
@@ -230,7 +231,7 @@
Map<String, Object> maps = new HashMap<>();
List<Map<String, Object>> datas = new ArrayList<>();
- List<Map<String, Object>> list2 = this.baseMapper.summaryOfIncomeDetailsListGroupSum1(1, ShiroExtUtil.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());
@@ -318,7 +319,7 @@
}
List<Map<String, Object>> datas1 = new ArrayList<>();
- list2 = this.baseMapper.summaryOfIncomeDetailsListGroupSum1(1, ShiroExtUtil.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());
@@ -442,16 +443,16 @@
public HSSFWorkbook exportSummaryOfIncomeDetails(String insertTime, Integer orderType, Integer incomeType, String name, String phone) throws Exception {
String startTime = "";
String endTime = "";
- if(ToolUtil.isNotEmpty(insertTime)){
+ if (ToolUtil.isNotEmpty(insertTime)) {
String[] split = insertTime.split(" - ");
startTime = split[0];
endTime = split[1];
}
- List<Map<String, Object>> list = this.baseMapper.summaryOfIncomeDetailsListGroupSum1(1, ShiroExtUtil.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;
-
+
for (Map<String, Object> income : list) {
Double orderMoney = Double.valueOf(null != income.get("orderMoney") ? income.get("orderMoney").toString() : "0");
Double payMoney = Double.valueOf(income.get("payMoney").toString());
@@ -459,7 +460,7 @@
Double overtimeDeduction = Double.valueOf(income.get("overtimeDeduction").toString());
Double complaint = Double.valueOf(income.get("complaint").toString());
String insertTime1 = income.get("insertTime").toString();
- Double taxiCardRevenue = Double.valueOf(new BigDecimal(income.get("taxiCardRevenue").toString()).setScale(2,RoundingMode.HALF_UP).toString());
+ Double taxiCardRevenue = Double.valueOf(new BigDecimal(income.get("taxiCardRevenue").toString()).setScale(2, RoundingMode.HALF_UP).toString());
Double other = Double.valueOf(new BigDecimal(income.get("other").toString()).setScale(2,RoundingMode.HALF_UP).toString());
money = orderMoney - money;
@@ -576,8 +577,8 @@
}
Map<String, Object> maps = new HashMap<>();
- 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);
+ 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,9 +597,9 @@
map.put("all", all.toString());
list1.add(map);
maps.put("rows", list1);
- System.out.println("支出明细"+list1);
+ System.out.println("支出明细" + list1);
- list1 = this.baseMapper.summaryOfSpendingDetailsList1(ShiroExtUtil.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;
}
@@ -607,13 +608,13 @@
public HSSFWorkbook exportSummaryOfSpendingDetails(String insertTime, Integer orderType, Integer incomeType, String name, String phone) throws Exception {
String startTime = "";
String endTime = "";
- if(ToolUtil.isNotEmpty(insertTime)){
+ if (ToolUtil.isNotEmpty(insertTime)) {
String[] split = insertTime.split(" - ");
startTime = split[0];
endTime = split[1];
}
- List<Map<String, Object>> list1 = this.baseMapper.summaryOfSpendingDetailsList1(ShiroExtUtil.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;
@@ -622,8 +623,8 @@
Object insertTime1 = map1.get("insertTime");
values[n][0] = insertTime1.toString();
values[n][1] = "";
- if(null != map1.get("orderType")){
- switch (Integer.valueOf(map1.get("orderType").toString())){
+ if (null != map1.get("orderType")) {
+ switch (Integer.valueOf(map1.get("orderType").toString())) {
case 1:
values[n][1] = "快车";
break;
--
Gitblit v1.7.1