Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-05 16cee07f274c039bf0dcb5da347859053b7c2586

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java

@@ -8,8 +8,11 @@
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.DriverRankVo;
import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
import com.stylefeng.guns.modular.system.model.TRegion;
import com.stylefeng.guns.modular.system.service.ITOrderPrivateCarService;
import com.stylefeng.guns.modular.system.service.ITRegionService;
import com.stylefeng.guns.modular.system.service.TAbnormalPayOrderService;
import com.stylefeng.guns.modular.system.util.ExcelExportUtil;
import lombok.SneakyThrows;
import org.springframework.stereotype.Controller;
@@ -49,6 +52,9 @@
    @Autowired
    private ShiroExtUtil shiroExtUtil;


    @Autowired
    private ITOrderPrivateCarService tOrderPrivateCarService;
    /**
     * 跳转到首页
     */
@@ -108,6 +114,18 @@
        model.addAttribute("driverId",id);
        return PREFIX + "tDriverPromotionActivityUser.html";
    }
    @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,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";
    }
    /**
     * 跳转到修改
     */