From 0c41f99c7f1a0d7deeeef23a5b3b890aed32ce63 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:20:50 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java
index 16d30dc..2ef2c7c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java
@@ -53,6 +53,12 @@
*/
@RequestMapping("")
public String index(Model model) {
+ List<Map<String, Object>> list=new ArrayList<>();
+ list = tOrderPrivateCarService.promotionInfoExport(null, null, null, null, null, null, null, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),null,null);
+ BigDecimal reduce = list.stream().map(e -> new BigDecimal(e.get("promotionMoney").toString())).reduce(BigDecimal.ZERO, BigDecimal::add);
+ model.addAttribute("money",reduce);
+ model.addAttribute("size",list.size());
+
return PREFIX + "tPromotionOrder.html";
}
@@ -66,7 +72,7 @@
String orderNum,
String userName,
String name,
- String driverName){
+ String driverName,Integer driverId,Integer activityId){
String beginTime = null;
String endTime = null;
if (SinataUtil.isNotEmpty(insertTime)) {
@@ -75,7 +81,7 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tOrderPrivateCarService.promotionInfo(page, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId()));
+ page.setRecords(tOrderPrivateCarService.promotionInfo(page, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),driverId,activityId));
return super.packForBT(page);
}
@@ -87,7 +93,7 @@
String orderNum,
String userName,
String name,
- String driverName, HttpServletRequest request, HttpServletResponse response) {
+ String driverName,Integer driverId, HttpServletRequest request, HttpServletResponse response) {
try {
String beginTime = null;
String endTime = null;
@@ -97,7 +103,7 @@
endTime = timeArray[1];
}
List<Map<String, Object>> list=new ArrayList<>();
- list = tOrderPrivateCarService.promotionInfoExport(null, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId());
+ list = tOrderPrivateCarService.promotionInfoExport(null, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),driverId,null);
// 表格数据【封装】
@@ -118,6 +124,7 @@
shellList.add("订单金额");
shellList.add("司机推广收益");
shellList.add("收益时间");
+ dataList.add(shellList);
for (Map<String,Object> object : list){
// 详细数据列【封装】
@@ -174,6 +181,29 @@
}
}
+ @PostMapping("/list1")
+ @ResponseBody
+ public Object list1(String insertTime,
+ String orderNum,
+ String userName,
+ String name,
+ String driverName,Integer driverId,Integer activityId) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)) {
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ List<Map<String, Object>> list=new ArrayList<>();
+ list = tOrderPrivateCarService.promotionInfoExport(null, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),driverId,activityId);
+ HashMap<String, Object> map = new HashMap<>();
+ BigDecimal reduce = list.stream().map(e -> new BigDecimal(e.get("promotionMoney").toString())).reduce(BigDecimal.ZERO, BigDecimal::add);
+ map.put("money", reduce);
+ map.put("size", list.size());
+ return map;
+ }
+
}
--
Gitblit v1.7.1