8.22后台

liujie

2025-08-20 9a044f2f4b810a0f7a3d568998bfd2b13797427e

8.22后台

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java

@@ -7,6 +7,7 @@
import com.stylefeng.guns.core.util.ExcelExportUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.service.ITOrderCrossCityService;
import com.stylefeng.guns.modular.system.service.ITOrderLogisticsService;
import com.stylefeng.guns.modular.system.service.ITOrderTaxiService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@@ -39,6 +40,8 @@
    @Resource
    private ITOrderCrossCityService orderCrossCityService;

    @Resource
    private ITOrderLogisticsService orderLogisticsService;
    
    /**
     * 跳转支付订单统计页
@@ -78,7 +81,9 @@
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
        List<Map<String, Object>> list1 = orderCrossCityService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
        List<Map<String, Object>> list2 = orderLogisticsService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
        list.addAll(list1);
        list.addAll(list2);
        list.sort((o1, o2) -> {
            String insertTime = o1.get("insertTime").toString();
            String insertTime1 = o2.get("insertTime").toString();

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderLogisticsMapper.java

@@ -43,4 +43,18 @@
     * @return
     */
    Map<String,Object> getLogisticsOrderDetailById(@Param("orderId") Integer orderId);

    List<Map<String, Object>> paymentOrderStatisticsList(@Param("page") Page<Map<String, Object>> page, @Param("paymentCode") String paymentCode, @Param("orderCode") String orderCode, @Param("userPhone") String userPhone, @Param("driverPhone") String driverPhone, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd, @Param("paymentTimeStart") String paymentTimeStart, @Param("paymentTimeEnd") String paymentTimeEnd, @Param("orderType") Integer orderType);












}

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml

@@ -142,5 +142,48 @@
        LEFT JOIN t_company as cc on cc.id = ot.companyId
        where ot.id = #{orderId}
    </select>
    <select id="paymentOrderStatisticsList" resultType="java.util.Map">
        select
        a.id,
        b.code as paymentCode,
        a.orderNum,
        c.phone as userPhone,
        b.amount,
        d.phone as driverPhone,
        e.name as company,
        f.money as income,
        b.orderType as orderType,
        DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime,
        DATE_FORMAT(b.insertTime, '%Y-%m-%d %H:%i:%s') as paymentTime
        from t_order_logistics a
        left join t_payment_record b on (a.id = b.orderId and b.orderType = 4 and b.state = 2)
        left join t_user c on (a.userId = c.id)
        left join t_driver d on (a.driverId = d.id)
        left join t_company e on (d.companyId = e.id)
        left join t_pub_transaction_details f on (a.id = f.orderId and f.userType = 2 and f.state = 2)
        where a.state in (8, 9) and a.isDelete = 1 and a.payManner = 1
        <if test="null != paymentCode and '' != paymentCode">
            and b.code like CONCAT('%', #{paymentCode}, '%')
        </if>
        <if test="null != orderCode and '' != orderCode">
            and a.orderNum like CONCAT('%', #{orderCode}, '%')
        </if>
        <if test="null != orderType">
            and b.orderType = #{orderType}
        </if>
        <if test="null != userPhone and '' != userPhone">
            and c.phone like CONCAT('%', #{userPhone}, '%')
        </if>
        <if test="null != driverPhone and '' != driverPhone">
            and d.phone like CONCAT('%', #{driverPhone}, '%')
        </if>
        <if test="null != createTimeStart and '' != createTimeStart and null != createTimeEnd and '' != createTimeEnd">
            and a.insertTime between #{createTimeStart} and #{createTimeEnd}
        </if>
        <if test="null != paymentTimeStart and '' != paymentTimeStart and null != paymentTimeEnd and '' != paymentTimeEnd">
            and b.insertTime between #{paymentTimeStart} and #{paymentTimeEnd}
        </if>
        order by a.insertTime desc
    </select>

</mapper>

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderLogisticsService.java

@@ -44,4 +44,6 @@
     */
    Map<String,Object> getLogisticsOrderDetailById(@Param("orderId") Integer orderId);

    List<Map<String, Object>> paymentOrderStatisticsList(Page<Map<String, Object>> page, String paymentCode, String orderCode, String userPhone, String driverPhone, String createTime, String paymentTime, Integer orderType);

}

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java

@@ -1,12 +1,14 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TOrderLogistics;
import com.stylefeng.guns.modular.system.dao.TOrderLogisticsMapper;
import com.stylefeng.guns.modular.system.service.ITOrderLogisticsService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;
import java.util.Map;

@@ -30,4 +32,24 @@
    public Map<String, Object> getLogisticsOrderDetailById(Integer orderId) {
        return this.baseMapper.getLogisticsOrderDetailById(orderId);
    }

    @Override
    public List<Map<String, Object>> paymentOrderStatisticsList(Page<Map<String, Object>> page, String paymentCode, String orderCode, String userPhone, String driverPhone, String createTime, String paymentTime, Integer orderType) {
        String createTimeStart = null;
        String createTimeEnd = null;
        String paymentTimeStart = null;
        String paymentTimeEnd = null;
        if(ToolUtil.isNotEmpty(createTime)){
            String[] split = createTime.split(" - ");
            createTimeStart = split[0];
            createTimeEnd = split[1];
        }
        if(ToolUtil.isNotEmpty(paymentTime)){
            String[] split = paymentTime.split(" - ");
            paymentTimeStart = split[0];
            paymentTimeEnd = split[1];
        }
        return this.baseMapper.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTimeStart, createTimeEnd, paymentTimeStart, paymentTimeEnd,orderType);

    }
}

 ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.js

@@ -21,8 +21,12 @@
            formatter: function (value, row) {
                if(row.orderType == 2) {
                    return '出租车订单';
                } else {
                } else if(row.orderType==3){
                    return '跨城出行订单';
                }else if(row.orderType==4){
                    return '同城小件物流订单';
                }else {
                    return '-';
                }
            }
        },
@@ -87,7 +91,7 @@
            content: Feng.ctxPath + '/tOrderTaxi/tOrderTaxi_update/' + id
        });
        this.layerIndex = index;
    }else {
    }else if(orderType==3){
        var index = layer.open({
            type: 2,
            title: '跨城出行订单详情',
@@ -97,6 +101,18 @@
            content: Feng.ctxPath + '/tOrderCrossCity/tOrderCrossCity_update/' + id
        });
        this.layerIndex = index;
    }else if(orderType==4){
        var index = layer.open({
            type: 2,
            title: '同城小件物流订单详情',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/tOrderLogistics/tOrderLogistics_detail/' + id
        });
        this.layerIndex = index;
    }else{
        Feng.info("未知订单类型！");
    }
};


 ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js

@@ -246,6 +246,8 @@
        return;
    }

    console.log(serverBox)


    var subArr=[];
    $(".timeClass").each(function () {