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/controller/general/IncomeDetailController.java | 115 +++++++++++++++++++++++++++++----------------------------
1 files changed, 59 insertions(+), 56 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java
index 3f2b697..8295d6b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java
@@ -6,12 +6,10 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TBalanceModifyRecord;
-import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -19,6 +17,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.math.BigDecimal;
@@ -46,19 +45,23 @@
@Autowired
private ITTaxiCardPaymentService taxiCardPaymentService;
-
+
@Autowired
private ITOrderLogisticsService orderLogisticsService;
-
+
@Autowired
private ITOrderTaxiService orderTaxiService;
-
+
@Autowired
private IIncomeService incomeService;
-
-
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
+
/**
* 跳转到订单收益
+ *
* @return
*/
@RequestMapping("order")
@@ -85,19 +88,19 @@
page.setRecords(null);
}else{*/
- List<Map<String, Object>> list = orderTaxiService.getIncomeOrderList(page, beginTime, endTime, phone, name, state, type, ShiroExtUtil.getUser().getObjectId(), income, payType);
- list = list.stream().filter(e-> ToolUtil.isNotEmpty(e.get("payState"))).collect(Collectors.toList());
+ List<Map<String, Object>> list = orderTaxiService.getIncomeOrderList(page, beginTime, endTime, phone, name, state, type, shiroExtUtil.getUser().getObjectId(), income, payType);
+ list = list.stream().filter(e -> ToolUtil.isNotEmpty(e.get("payState"))).collect(Collectors.toList());
Page<Map<String, Object>> page1 = new Page<>(0, 1000000);
- List<Map<String, Object>> list1 = orderTaxiService.getIncomeOrderList(page1, beginTime, endTime, phone, name, state, type, ShiroExtUtil.getUser().getObjectId(), income, payType);
- list1 = list1.stream().filter(e->ToolUtil.isNotEmpty(e.get("payState"))).collect(Collectors.toList());
- BigDecimal orderMoney = new BigDecimal("0");
- BigDecimal money = new BigDecimal("0");
- BigDecimal payMoney = new BigDecimal("0");
- BigDecimal couponMoney = new BigDecimal("0");
- BigDecimal discountAmount = new BigDecimal("0");
- BigDecimal redPacketMoney = new BigDecimal("0");
- BigDecimal additionalFee = new BigDecimal("0");
- BigDecimal other = new BigDecimal("0");
+ List<Map<String, Object>> list1 = orderTaxiService.getIncomeOrderList(page1, beginTime, endTime, phone, name, state, type, shiroExtUtil.getUser().getObjectId(), income, payType);
+ list1 = list1.stream().filter(e -> ToolUtil.isNotEmpty(e.get("payState"))).collect(Collectors.toList());
+ BigDecimal orderMoney = new BigDecimal("0");
+ BigDecimal money = new BigDecimal("0");
+ BigDecimal payMoney = new BigDecimal("0");
+ BigDecimal couponMoney = new BigDecimal("0");
+ BigDecimal discountAmount = new BigDecimal("0");
+ BigDecimal redPacketMoney = new BigDecimal("0");
+ BigDecimal additionalFee = new BigDecimal("0");
+ BigDecimal other = new BigDecimal("0");
for (Map<String, Object> map : list) {
Object money1 = map.get("money");
BigDecimal bigDecimal = new BigDecimal(money1.toString());
@@ -224,7 +227,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String, Object>> mapList = orderTaxiService.getIncomeOrderListEx(beginTime, endTime, phone, name, state, type, ShiroExtUtil.getUser().getObjectId(), income, payType);
+ List<Map<String, Object>> mapList = orderTaxiService.getIncomeOrderListEx(beginTime, endTime, phone, name, state, type, shiroExtUtil.getUser().getObjectId(), income, payType);
mapList = mapList.stream().filter(e-> ToolUtil.isNotEmpty(e.get("payState"))).collect(Collectors.toList());
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -388,8 +391,8 @@
page.setRecords(null);
}else{*/
- List<Map<String, Object>> list = orderLogisticsService.getTimeOutOrderList(page, beginTime, endTime, phone, name, id, ShiroExtUtil.getUser().getObjectId(), orderType);
- Map<String, Object> map = orderLogisticsService.getTimeOutOrderSumMoney(beginTime, endTime, phone, name, id, ShiroExtUtil.getUser().getObjectId(), orderType);
+ List<Map<String, Object>> list = orderLogisticsService.getTimeOutOrderList(page, beginTime, endTime, phone, name, id, shiroExtUtil.getUser().getObjectId(), orderType);
+ Map<String, Object> map = orderLogisticsService.getTimeOutOrderSumMoney(beginTime, endTime, phone, name, id, shiroExtUtil.getUser().getObjectId(), orderType);
if (!list.isEmpty() && map != null) {
map.put("id", "合计");
list.add(map);
@@ -425,7 +428,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String, Object>> mapList = orderLogisticsService.getTimeOutOrderListEx(beginTime, endTime, phone, name, id, ShiroExtUtil.getUser().getObjectId(), orderType);
+ List<Map<String, Object>> mapList = orderLogisticsService.getTimeOutOrderListEx(beginTime, endTime, phone, name, id, shiroExtUtil.getUser().getObjectId(), orderType);
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -497,7 +500,7 @@
String cardName) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
@@ -507,16 +510,16 @@
page.setRecords(null);
}else{*/
- List<Map<String, Object>> list = taxiCardPaymentService.getList(page, beginTime, endTime, null, type, phone, name, id, cardName, ShiroExtUtil.getUser().getObjectId());
- if(list!=null && list.size()>0){
- Map<String,Object> map = new HashMap<>();
- map.put("id", "合计");
- map.put("payMoney", taxiCardPaymentService.getSumMoney(beginTime, endTime, null, type, phone, name, id, cardName, ShiroExtUtil.getUser().getObjectId()));
- list.add(map);
- }
-
- page.setRecords(list);
- /* }*/
+ List<Map<String, Object>> list = taxiCardPaymentService.getList(page, beginTime, endTime, null, type, phone, name, id, cardName, shiroExtUtil.getUser().getObjectId());
+ if (list != null && list.size() > 0) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", "合计");
+ map.put("payMoney", taxiCardPaymentService.getSumMoney(beginTime, endTime, null, type, phone, name, id, cardName, shiroExtUtil.getUser().getObjectId()));
+ list.add(map);
+ }
+
+ page.setRecords(list);
+ /* }*/
return super.packForBT(page);
}
@@ -533,28 +536,28 @@
DateFormat format = new SimpleDateFormat("yyyyMMdd");
String time = format.format(date);
String fileName = "打车卡"+time+".xls";
- String[] title = new String[] {"支付时间","流水ID","打车卡名称","打车卡类型","乘客名称","乘客手机号","支付类型","收益金额"};
-
-
+ String[] title = new String[]{"支付时间", "流水ID", "打车卡名称", "打车卡类型", "乘客名称", "乘客手机号", "支付类型", "收益金额"};
+
+
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new Page<>(1, 10000000);
- List<Map<String, Object>> mapList = taxiCardPaymentService.getList(page, beginTime, endTime, null, type, phone, name, id, cardName, ShiroExtUtil.getUser().getObjectId());
-
+ List<Map<String, Object>> mapList = taxiCardPaymentService.getList(page, beginTime, endTime, null, type, phone, name, id, cardName, shiroExtUtil.getUser().getObjectId());
+
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
- Map<String,Object> d=mapList.get(i);
+ Map<String, Object> d = mapList.get(i);
values[i] = new String[title.length];
- values[i][0]=d.get("createTime").toString();
- values[i][1]=d.get("id").toString();
- values[i][2]=d.get("cardName").toString();
- values[i][3]=d.get("typeName").toString();
- values[i][4]=d.get("nickName")!=null?d.get("nickName").toString():"";
+ values[i][0] = d.get("createTime").toString();
+ values[i][1] = d.get("id").toString();
+ values[i][2] = d.get("cardName").toString();
+ values[i][3] = d.get("typeName").toString();
+ values[i][4] = d.get("nickName") != null ? d.get("nickName").toString():"";
values[i][5]=d.get("phone")!=null?d.get("phone").toString():"";
String payType = d.get("payType").toString();
if("1".equals(payType)){
@@ -594,21 +597,21 @@
String id) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String, Object>> list = complaintDeductmoneyService.getList(page, beginTime, endTime, null, userPhone, userName, id, ShiroExtUtil.getUser().getObjectId());
- if(list!=null && list.size()>0){
- Map<String,Object> map = new HashMap<>();
- map.put("id", "合计");
- map.put("money", complaintDeductmoneyService.getSumMoney(beginTime, endTime, null, userPhone, userName, id, ShiroExtUtil.getUser().getObjectId()));
- list.add(map);
- }
- page.setRecords(list);
+ List<Map<String, Object>> list = complaintDeductmoneyService.getList(page, beginTime, endTime, null, userPhone, userName, id, shiroExtUtil.getUser().getObjectId());
+ if (list != null && list.size() > 0) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", "合计");
+ map.put("money", complaintDeductmoneyService.getSumMoney(beginTime, endTime, null, userPhone, userName, id, shiroExtUtil.getUser().getObjectId()));
+ list.add(map);
+ }
+ page.setRecords(list);
return super.packForBT(page);
}
@@ -634,7 +637,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String, Object>> mapList = complaintDeductmoneyService.getListEx(beginTime, endTime, null, userPhone, userName, id, ShiroExtUtil.getUser().getObjectId());
+ List<Map<String, Object>> mapList = complaintDeductmoneyService.getListEx(beginTime, endTime, null, userPhone, userName, id, shiroExtUtil.getUser().getObjectId());
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
--
Gitblit v1.7.1