liujie
2025-08-04 b86c7fed91fec207141da20e7059666ffe1eb30e
推广活动
11个文件已修改
78 ■■■■ 已修改文件
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverRankVo.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tDriverPromotionActivity1.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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";
    }
    /**
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java
@@ -54,7 +54,7 @@
    @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);
        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());
@@ -72,7 +72,7 @@
                       String orderNum,
                       String userName,
                       String name,
                       String driverName,Integer driverId){
                       String driverName,Integer driverId,Integer activityId){
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)) {
@@ -81,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(),driverId));
        page.setRecords(tOrderPrivateCarService.promotionInfo(page, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),driverId,activityId));
        return super.packForBT(page);
    }
@@ -103,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(),driverId);
            list =  tOrderPrivateCarService.promotionInfoExport(null, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),driverId,null);
            // 表格数据【封装】
@@ -187,7 +187,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)) {
@@ -196,7 +196,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(),null);
            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);
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
@@ -71,7 +71,7 @@
    List<Map<String,Object>> getSurcharge(@Param("id") Object id,@Param("orderType") Integer orderType);
    List<Map<String, Object>> promotionInfo(@Param("page") Page<Map<String, Object>> page, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId);
    List<Map<String, Object>> promotionInfo(@Param("page") Page<Map<String, Object>> page, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId,@Param("activityId") Integer activityId);
    List<Map<String, Object>> promotionInfoExport(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId);
    List<Map<String, Object>> promotionInfoExport(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId, @Param("activityId") Integer activityId);
}
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -273,6 +273,9 @@
        <if test="orderNum != null and orderNum != ''">
            and t1.orderNum  =#{orderNum}
        </if>
        <if test="activityId != null">
            and t1.promotionActivityId  =#{activityId}
        </if>
        <if test="beginTime != null and endTime != null">
            and t1.successTime  between #{beginTime} and #{endTime}
        </if>
@@ -301,6 +304,9 @@
        where t1.promotionActivityId is not null
        <if test="orderNum != null and orderNum != ''">
            and t1.orderNum  =#{orderNum}
        </if>
        <if test="activityId != null">
            and t1.promotionActivityId  =#{activityId}
        </if>
        <if test="beginTime != null and endTime != null">
            and t1.successTime  between #{beginTime} and #{endTime}
@@ -331,6 +337,9 @@
        where t1.promotionActivityId is not null
        <if test="orderNum != null and orderNum != ''">
            and t1.orderNum  =#{orderNum}
        </if>
        <if test="activityId != null">
            and t1.promotionActivityId  =#{activityId}
        </if>
        <if test="beginTime != null and endTime != null">
            and t1.successTime  between #{beginTime} and #{endTime}
@@ -364,6 +373,9 @@
        <if test="orderNum != null and orderNum != ''">
            and t1.orderNum  =#{orderNum}
        </if>
        <if test="activityId != null">
            and t1.promotionActivityId  =#{activityId}
        </if>
        <if test="beginTime != null and endTime != null">
            and t1.successTime  between #{beginTime} and #{endTime}
        </if>
@@ -392,6 +404,9 @@
        where t1.promotionActivityId is not null
        <if test="orderNum != null and orderNum != ''">
            and t1.orderNum  =#{orderNum}
        </if>
        <if test="activityId != null">
            and t1.promotionActivityId  =#{activityId}
        </if>
        <if test="beginTime != null and endTime != null">
            and t1.successTime  between #{beginTime} and #{endTime}
@@ -423,6 +438,9 @@
        <if test="orderNum != null and orderNum != ''">
            and t1.orderNum  =#{orderNum}
        </if>
        <if test="activityId != null">
            and t1.promotionActivityId  =#{activityId}
        </if>
        <if test="beginTime != null and endTime != null">
            and t1.successTime  between #{beginTime} and #{endTime}
        </if>
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverRankVo.java
@@ -13,4 +13,6 @@
    private Integer userNum;
    private BigDecimal money;
    private Long activityId;
}
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
@@ -71,8 +71,8 @@
    List<Map<String,Object>> getSurcharge(Object id,Integer orderType);
    List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId);
    List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId);
    List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId);
    List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId);
}
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java
@@ -65,6 +65,7 @@
        for (TDriver tDriver : tDrivers) {
            DriverRankVo driverRankVo = new DriverRankVo();
            driverRankVo.setActivityId(id);
            driverRankVo.setDriverId(tDriver.getId());
            driverRankVo.setDriverName(tDriver.getName());
            long count = tUsers.stream().filter(e -> tDriver.getId().equals(e.getBindDriverId())).count();
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
@@ -115,12 +115,12 @@
    }
    @Override
    public List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId) {
        return this.baseMapper.promotionInfo(page, beginTime, endTime, orderNum, userName, name, driverName, roleType, objectId,driverId);
    public List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId) {
        return this.baseMapper.promotionInfo(page, beginTime, endTime, orderNum, userName, name, driverName, roleType, objectId,driverId,activityId);
    }
    @Override
    public List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId) {
        return this.baseMapper.promotionInfoExport(beginTime, endTime, orderNum, userName, name, driverName, roleType, objectId,driverId);
    public List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId) {
        return this.baseMapper.promotionInfoExport(beginTime, endTime, orderNum, userName, name, driverName, roleType, objectId,driverId,activityId);
    }
}
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html
@@ -7,6 +7,7 @@
            </div>
            <div class="ibox-content">
                <input type="hidden" id="driverId" value="${driverId}">
                <input type="hidden" id="activityId" value="${activityId}">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
@@ -87,6 +88,7 @@
        let driverName = $('#driverName').val();
        let userName = $('#userName').val();
        let orderNum = $('#orderNum').val();
        let activityId = $('#activityId').val();
        //提交信息
@@ -101,13 +103,15 @@
        ajax.set("driverName",driverName);
        ajax.set("userName",userName);
        ajax.set("orderNum",orderNum);
        ajax.set("activityId",activityId);
        ajax.start();
        TAbnormalOrder.search()
    }
    function resetSearch() {
        let activityId = $('#activityId').val();
        let driverId = $('#driverId').val();
        //提交信息
        var ajax = new $ax(Feng.ctxPath + "/promotionInfo/list1", function(data){
            console.log(data)
@@ -115,7 +119,10 @@
            $("#size").text(data.size)
        },function(data){
        });
        ajax.set("activityId",activityId);
        ajax.set("driverId",driverId);
        ajax.start();
        TAbnormalOrder.resetSearch()
    }
</script>
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tDriverPromotionActivity1.js
@@ -30,7 +30,7 @@
            formatter: function (value, row) {
                    var btn = [];
                    btn += '<a href="javascript:void(0);" onclick="TDriverPromotionActivity.viewUser(' + row.driverId + ')" style="color: #0e9aef">查看下级用户</a>&nbsp;&nbsp;';
                    btn += '<a href="javascript:void(0);" onclick="TDriverPromotionActivity.viewMoney(' + row.driverId + ')" style="color: #0e9aef">查看收益明细</a>&nbsp;&nbsp;';
                    btn += '<a href="javascript:void(0);" onclick="TDriverPromotionActivity.viewMoney(' + row.driverId+","+row.activityId + ')" style="color: #0e9aef">查看收益明细</a>&nbsp;&nbsp;';
                    return btn;
                }
@@ -86,14 +86,14 @@
/**
 * 打开查看详情
 */
TDriverPromotionActivity.viewMoney = function (e) {
TDriverPromotionActivity.viewMoney = function (e,e1) {
    var index = layer.open({
        type: 2,
        title: '推广收益明细',
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/tDriverPromotionActivity/tDriverPromotionActivity_viewMoney/' + e
        content: Feng.ctxPath + '/tDriverPromotionActivity/tDriverPromotionActivity_viewMoney/' + e+"/"+e1
    });
    this.layerIndex = index;
};
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js
@@ -214,6 +214,7 @@
    queryData['userName'] = $("#userName").val();
    queryData['orderNum'] = $("#orderNum").val();
    queryData['driverId'] = $("#driverId").val();
    queryData['activityId'] = $("#activityId").val();
    TAbnormalOrder.table.refresh({query: queryData});
};
@@ -225,6 +226,7 @@
    let userName = $('#userName').val();
    let orderNum = $('#orderNum').val();
    let driverId = $('#driverId').val();
    let activityId = $('#activityId').val();
    if(null != insertTime && '' != insertTime){
        p += "insertTime=" + insertTime + "&";
    }
@@ -242,6 +244,9 @@
    }
    if(null != driverId && '' != driverId){
        p += "driverId=" + driverId + "&" ;
    }
    if(null != activityId && '' != activityId){
        p += "activityId=" + activityId + "&" ;
    }
    if('' != p){
        p = "?" + p.substring(0, p.length - 1);
@@ -265,7 +270,7 @@
$(function () {
    var defaultColunms = TAbnormalOrder.initColumn();
    var table = new BSTable(TAbnormalOrder.id, "/promotionInfo/list?driverId="+$('#driverId').val(), defaultColunms);
    var table = new BSTable(TAbnormalOrder.id, "/promotionInfo/list?driverId="+$('#driverId').val()+"&activityId="+$('#activityId').val(), defaultColunms);
    table.setPaginationType("server");
    TAbnormalOrder.table = table.init();
});