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/SpendingDetailPlatformController.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SpendingDetailPlatformController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SpendingDetailPlatformController.java
index e4a19e3..e7198d4 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SpendingDetailPlatformController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SpendingDetailPlatformController.java
@@ -6,7 +6,6 @@
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.DateUtil;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.ToolUtil;
@@ -19,10 +18,10 @@
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -76,17 +75,20 @@
@Autowired
private ITOrderLogisticsService orderLogisticsService;
-
+
@Autowired
private ITSysWithdrawalPoundageService withdrawalPoundageService;
-
+
@Autowired
private ITTimeoutAppealService timeoutAppealService;
-
+
@Autowired
private ITReassignService reassignService;
-
-
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
+
/**
* 跳转订单收益明细
*/
@@ -94,8 +96,8 @@
public String index() {
return PREFIX + "orderRevenueDetails.html";
}
-
-
+
+
/**
* 跳转到奖励收益明细
*/
@@ -1092,7 +1094,7 @@
*/
@RequestMapping(value = "/detail/{driverId}")
public String detail(@PathVariable Integer driverId, Model model){
- Map<String, Object> map = driverService.selectMap(new EntityWrapper<TDriver>().eq("id", driverId).eq("companyId", ShiroExtUtil.getUser().getObjectId()));
+ Map<String, Object> map = driverService.selectMap(new EntityWrapper<TDriver>().eq("id", driverId).eq("companyId", shiroExtUtil.getUser().getObjectId()));
double activityIncome;
Wrapper wrapper1 = new EntityWrapper<Income>().eq("userType",2).eq("objectId",driverId).eq("type",1);
@@ -1196,17 +1198,17 @@
@ResponseBody
public Object list(String driverName, String driverPhone, String startTime, String endTime) {
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- Wrapper wrapper = new EntityWrapper<TDriver>().eq("companyId", ShiroExtUtil.getUser().getObjectId()).orderBy("id", false);
-
+ Wrapper wrapper = new EntityWrapper<TDriver>().eq("companyId", shiroExtUtil.getUser().getObjectId()).orderBy("id", false);
+
if (ToolUtil.isNotEmpty(driverName)) {
wrapper.like("name", driverName);
}
if (ToolUtil.isNotEmpty(driverPhone)) {
wrapper.like("phone", driverPhone);
}
-
+
List<Map<String, Object>> list = driverService.selectMapsPage(page, wrapper).getRecords();
-
+
for (Map<String, Object> map : list) {
/// 活动收益
--
Gitblit v1.7.1