黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liujie
2025-08-05 4485600cb2549dae5e18901aa3ac8ed34fc68ca3 
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java


@@ -29,6 +29,7 @@


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.util.*;


import java.util.stream.Collectors;




/**


 * 控制器


@@ -114,15 +115,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";


    }


    /**


@@ -299,6 +301,12 @@


        tDriverPromotionActivity.setProvinceCode(province);


        tDriverPromotionActivity.setCityCode(city);


        tDriverPromotionActivity.setDistrictCode(area);




        List<TRegion> code = tRegionService.selectList(new EntityWrapper<TRegion>().in("code", Arrays.asList(province, city, area)));




        tDriverPromotionActivity.setProvince(code.stream().filter(e->e.getCode().equals( province)).collect(Collectors.toList()).get(0).getName());


        tDriverPromotionActivity.setCity(code.stream().filter(e->e.getCode().equals( city)).collect(Collectors.toList()).get(0).getName());


        tDriverPromotionActivity.setDistrict(code.stream().filter(e->e.getCode().equals(area)).collect(Collectors.toList()).get(0).getName());


        String s = time.split(" - ")[0] + " 00:00:00";


        String s1 = time.split(" - ")[1] + " 23:59:59";


        tDriverPromotionActivity.setStartTime(simpleDateFormat.parse(s));


@@ -355,6 +363,11 @@


        tDriverPromotionActivity.setProvinceCode(province);


        tDriverPromotionActivity.setCityCode(city);


        tDriverPromotionActivity.setDistrictCode(area);


        List<TRegion> code = tRegionService.selectList(new EntityWrapper<TRegion>().in("code", Arrays.asList(province, city, area)));




        tDriverPromotionActivity.setProvince(code.stream().filter(e->e.getCode().equals( province)).collect(Collectors.toList()).get(0).getName());


        tDriverPromotionActivity.setCity(code.stream().filter(e->e.getCode().equals( city)).collect(Collectors.toList()).get(0).getName());


        tDriverPromotionActivity.setDistrict(code.stream().filter(e->e.getCode().equals(area)).collect(Collectors.toList()).get(0).getName());


        String s = time.split(" - ")[0] + " 00:00:00";


        String s1 = time.split(" - ")[1] + " 23:59:59";


        tDriverPromotionActivity.setStartTime(simpleDateFormat.parse(s));