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/TOrderTaxiServiceImpl.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java
index cd5c332..f58f210 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.plugins.Page;
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.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.dao.TOrderTaxiMapper;
@@ -41,23 +40,25 @@
@Autowired
private ITReassignService reassignService;
-
+
@Autowired
private ITCompanyService companyService;
-
+
@Autowired
private ITLineService lineService;
-
+
@Autowired
private IIncomeService incomeService;
-
-
-
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
+
@Override
public List<Map<String, Object>> getTaxiOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, String driver, Integer state) {
return this.baseMapper.getTaxiOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state);
}
-
+
@Override
public Map<String, Object> getTaxiOrderDetailById(Integer orderId) {
return this.baseMapper.getTaxiOrderDetailById(orderId);
@@ -447,7 +448,7 @@
@Override
public List<Map<String, Object>> queryOtherIncomeDetail(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNo, String name, String phone) {
- Integer objectId = ShiroExtUtil.getUser().getObjectId();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
return this.baseMapper.queryOtherIncomeDetail(page, beginTime, endTime, orderNo, name, phone,objectId);
}
@@ -456,18 +457,18 @@
Date date = new Date();
DateFormat format = new SimpleDateFormat("yyyyMMdd");
String time = format.format(date);
- Integer objectId = ShiroExtUtil.getUser().getObjectId();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
List<Map<String, Object>> mapList = this.baseMapper.exportOtherIncomeDetail(beginTime, endTime, orderNo, name, phone, objectId);
- String[] title = new String[] {"交易时间","订单号","下单用户昵称","下单用户手机号","感谢费"/*,"附加费"*/};
+ String[] title = new String[]{"交易时间", "订单号", "下单用户昵称", "下单用户手机号", "感谢费"/*,"附加费"*/};
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]=null == d.get("insertTime") ? "" : d.get("insertTime").toString();
- values[i][1]=null == d.get("orderNum") ? "" : d.get("orderNum").toString();
- values[i][2]=null == d.get("nickName") ? "" : d.get("nickName").toString();
- values[i][3]=null == d.get("phone") ? "" : d.get("phone").toString();
- values[i][4]=null == d.get("thankYouFee") ? "0" : d.get("thankYouFee").toString();
+ values[i][0] = null == d.get("insertTime") ? "" : d.get("insertTime").toString();
+ values[i][1] = null == d.get("orderNum") ? "" : d.get("orderNum").toString();
+ values[i][2] = null == d.get("nickName") ? "" : d.get("nickName").toString();
+ values[i][3] = null == d.get("phone") ? "" : d.get("phone").toString();
+ values[i][4] = null == d.get("thankYouFee") ? "0" : d.get("thankYouFee").toString();
// values[i][5]=null == d.get("additionalFee") ? "0" : d.get("additionalFee").toString();
}
String fileNameTitle="平台其他收入明细";
--
Gitblit v1.7.1