From b86c7fed91fec207141da20e7059666ffe1eb30e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 04 八月 2025 16:32:43 +0800
Subject: [PATCH] 推广活动

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
index 008dfda..68ad9b0 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
@@ -114,15 +114,16 @@
         model.addAttribute("driverId",id);
         return PREFIX + "tDriverPromotionActivityUser.html";
     }
-    @RequestMapping("/tDriverPromotionActivity_viewMoney/{id}")
-    public String tDriverPromotionActivityViewMoney(@PathVariable Integer id, Model model) {
+    @RequestMapping("/tDriverPromotionActivity_viewMoney/{id}/{activityId}")
+    public String tDriverPromotionActivityViewMoney(@PathVariable Integer id,@PathVariable Integer activityId, 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(),id);
+        list =  tOrderPrivateCarService.promotionInfoExport(null, null, null, null, null, null, null, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),id,activityId);
         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());
 
         model.addAttribute("driverId",id);
+        model.addAttribute("activityId",activityId);
         return PREFIX + "tPromotionOrder.html";
     }
     /**

--
Gitblit v1.7.1