修改管理后台报表统计 1、修改管理后台充电订单统计 2、修改记录分账数据前先软删除之前的数据，然后根据实际支付金额（扣除退款）生成最新的分账记录

puzhibing

2026-07-31 12eb750cd2391be14cfbfae2af6d0fdf16e1ea0c

修改管理后台报表统计
1、修改管理后台充电订单统计
2、修改记录分账数据前先软删除之前的数据，然后根据实际支付金额（扣除退款）生成最新的分账记录

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java

@@ -28,7 +28,7 @@

/**
 * <p>
 *  Mapper 接口
 * Mapper 接口
 * </p>
 *
 * @author xiaochen
@@ -36,54 +36,66 @@
 */
@Mapper
public interface TChargingOrderMapper extends BaseMapper<TChargingOrder> {
	
	
    /**
     * 获取小程序充电记录列表数据
     * @param appUserId
     * @param type
     * @param pageCurr
     * @param pageSize
     * @return
     */
    List<TChargingOrder> getMyChargingOrderList(@Param("appUserId") Long appUserId, @Param("type") Integer type,
                                                @Param("pageCurr") Integer pageCurr, @Param("pageSize") Integer pageSize);
	
	
    /**
     * 获取待开票订单列表
     * @param month 筛选时间2024-01-01
     * @param pageCurr
     * @param pageSize
     * @return
     */
    List<TChargingOrder> getNoInvoicedOrder(@Param("appUserId") Long appUserId, @Param("month") String month,
                                            @Param("pageCurr") Integer pageCurr, @Param("pageSize") Integer pageSize);

    List<ChargingOrderVO> chargingOrder(@Param("pageInfo") PageInfo<ChargingOrderVO> pageInfo, @Param("req") ChargingOrderQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2,@Param("endTime1") String endTime1,@Param("endTime2") String endTime11);
    Map<String, Object> chargingOrderBaseSummary(@Param("req") ChargingOrderQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2,@Param("endTime1") String endTime1,@Param("endTime2") String endTime11);
    Map<String, Object> chargingOrderNolimit( @Param("req") ChargingOrderQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2,@Param("endTime1") String endTime1,@Param("endTime2") String endTime11);
    Map<String, Object> chargingOrderFundSummary(@Param("req") ChargingOrderQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2,@Param("endTime1") String endTime1,@Param("endTime2") String endTime11);
    List<Long> chargingOrderSummaryOrderIds(@Param("req") ChargingOrderQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2,@Param("endTime1") String endTime1,@Param("endTime2") String endTime11);

    /**
     * 获取小程序充电记录列表数据
     *
     * @param appUserId
     * @param type
     * @param pageCurr
     * @param pageSize
     * @return
     */
    List<TChargingOrder> getMyChargingOrderList(@Param("appUserId") Long appUserId, @Param("type") Integer type,
                                                @Param("pageCurr") Integer pageCurr, @Param("pageSize") Integer pageSize);


    /**
     * 获取待开票订单列表
     *
     * @param month    筛选时间2024-01-01
     * @param pageCurr
     * @param pageSize
     * @return
     */
    List<TChargingOrder> getNoInvoicedOrder(@Param("appUserId") Long appUserId, @Param("month") String month,
                                            @Param("pageCurr") Integer pageCurr, @Param("pageSize") Integer pageSize);

    List<ChargingOrderVO> chargingOrder(@Param("pageInfo") PageInfo<ChargingOrderVO> pageInfo, @Param("req") ChargingOrderQuery dto, @Param("startTime1") String startTime1, @Param("startTime2") String startTime2, @Param("endTime1") String endTime1, @Param("endTime2") String endTime11);

    Map<String, Object> chargingOrderBaseSummary(@Param("req") ChargingOrderQuery dto, @Param("startTime1") String startTime1, @Param("startTime2") String startTime2, @Param("endTime1") String endTime1, @Param("endTime2") String endTime11);

    Map<String, Object> chargingOrderNolimit(@Param("req") ChargingOrderQuery dto, @Param("startTime1") String startTime1, @Param("startTime2") String startTime2, @Param("endTime1") String endTime1, @Param("endTime2") String endTime11);

    Map<String, Object> chargingOrderFundSummary(@Param("req") ChargingOrderQuery dto, @Param("startTime1") String startTime1, @Param("startTime2") String startTime2, @Param("endTime1") String endTime1, @Param("endTime2") String endTime11);

    List<Long> chargingOrderSummaryOrderIds(@Param("req") ChargingOrderQuery dto, @Param("startTime1") String startTime1, @Param("startTime2") String startTime2, @Param("endTime1") String endTime1, @Param("endTime2") String endTime11);

    Map<String, Object> exchangeCodeBalanceSummary(@Param("orderIds") List<Long> orderIds);

    List<Map<String, Object>> exchangeCodeBalanceIncomeByOrderIds(@Param("orderIds") List<Long> orderIds);

    List<ChargingOrderBalanceIncomeDetailVO> exchangeCodeBalanceIncomeDetail(@Param("orderIds") List<Long> orderIds);

    List<Map<String, Object>> chargingOrderShareIncomeByOrderIds(@Param("orderIds") List<Long> orderIds);

    Map<String, Object> chargingOrderShareIncomeSummaryByOrderIds(@Param("orderIds") List<Long> orderIds);

    List<PayOrderDto> payOrderQuery(@Param("pageInfo")PageInfo<PayOrderDto> pageInfo,@Param("data") PayOrderQueryDto payOrderQueryDto);
    List<PayOrderDto> payOrderQuery(@Param("pageInfo") PageInfo<PayOrderDto> pageInfo, @Param("data") PayOrderQueryDto payOrderQueryDto);

    List<EnterpriseChargingAnalysisVO> enterpriseChargingAnalysis(@Param("pageInfo") PageInfo<EnterpriseChargingAnalysisVO> pageInfo,
                                                                  @Param("data") EnterpriseChargingAnalysisQuery query);

    List<Map<String, Object>> enterpriseTopSites(@Param("data") EnterpriseChargingAnalysisQuery query);

    List<Map<String, Object>> enterpriseTopSitesByCompanies(@Param("data") EnterpriseChargingAnalysisQuery query,
                                                             @Param("companyNames") List<String> companyNames);
                                                            @Param("companyNames") List<String> companyNames);

    List<LocalDateTime> enterpriseChargingTimes(@Param("data") EnterpriseChargingAnalysisQuery query);

    List<Map<String, Object>> enterpriseChargingTimesByCompanies(@Param("data") EnterpriseChargingAnalysisQuery query,
                                                                  @Param("companyNames") List<String> companyNames);
                                                                 @Param("companyNames") List<String> companyNames);

    List<Long> enterpriseInvoiceIds(@Param("data") EnterpriseChargingAnalysisQuery query);

@@ -99,12 +111,12 @@

    List<Map<String, Object>> enterpriseChargingPeriodCounts(@Param("orderIds") List<Long> orderIds);

    List<TChargingOrderRefund> getRefundList(@Param("pageInfo")PageInfo<TChargingOrderRefund> pageInfo,@Param("data")  ChargingRefundDto chargingRefundDto);
    List<TChargingOrderRefund> getRefundList(@Param("pageInfo") PageInfo<TChargingOrderRefund> pageInfo, @Param("data") ChargingRefundDto chargingRefundDto);

    List<TChargingOrderRefund> getRefundListWithoutOrderJoin(@Param("pageInfo") PageInfo<TChargingOrderRefund> pageInfo,
            @Param("data") ChargingRefundDto chargingRefundDto);
    List<TChargingOrderRefund> getRefundListWithoutOrderJoin(@Param("pageInfo") PageInfo<TChargingOrderRefund> pageInfo,
                                                             @Param("data") ChargingRefundDto chargingRefundDto);

    List<ChargingOrderGroup> chargingOrderGroup(@Param("chargingPercentProvinceDto")ChargingPercentProvinceDto chargingPercentProvinceDto);
    List<ChargingOrderGroup> chargingOrderGroup(@Param("chargingPercentProvinceDto") ChargingPercentProvinceDto chargingPercentProvinceDto);

    List<SixChargingDto> chargePartner(@Param("sixBefore") String sixBefore, @Param("siteIds") List<Integer> siteIds);

@@ -112,80 +124,84 @@

    List<SixChargingDto> chargeCurrentMonth(@Param("siteIdsCsv") String siteIdsCsv);

    List<SixCircleDto> circle(@Param("siteIds")List<Integer> siteIds,@Param("sixBefore")LocalDate sixBefore, @Param("partnerView") Boolean partnerView);
    List<SixCircleDto> circle(@Param("siteIds") List<Integer> siteIds, @Param("sixBefore") LocalDate sixBefore, @Param("partnerView") Boolean partnerView);

    BigDecimal sumSuccessfulShareAmount(@Param("siteIds") List<Integer> siteIds);
    BigDecimal sumSuccessfulShareAmount(@Param("siteIds") List<Integer> siteIds);

    Map<String, Object> countAll(@Param("siteIds")List<Integer> siteIds, @Param("partnerView") Boolean partnerView);
    List<Map<String, Object>> chargingOrderShareIncomeByPayChannel(@Param("sixBefore")LocalDate sixBefore,@Param("siteIds") List<Integer> siteIds);
    Map<String, Object> countAll(@Param("siteIds") List<Integer> siteIds, @Param("partnerView") Boolean partnerView);

    List<Map<String, Object>> getSumByType(@Param("start")LocalDateTime start,@Param("end")LocalDateTime end,@Param("siteIds")List<Integer> siteIds);
    List<Map<String, Object>> chargingOrderShareIncomeByPayChannel(@Param("sixBefore") LocalDate sixBefore, @Param("siteIds") List<Integer> siteIds);

    List<Map<String, Object>> getDateData(@Param("start")LocalDateTime start,@Param("end")LocalDateTime end,@Param("siteIds")List<Integer> siteIds);
    List<Map<String, Object>> getSumByType(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end, @Param("siteIds") List<Integer> siteIds);

    List<Map<String, Object>> getWeekData(@Param("start")LocalDateTime start,@Param("end")LocalDateTime end,@Param("siteIds")List<Integer> siteIds);
    List<Map<String, Object>> getDateData(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end, @Param("siteIds") List<Integer> siteIds);

    List<Map<String, Object>> getMonthData(@Param("start")LocalDateTime start,@Param("end")LocalDateTime end,@Param("siteIds")List<Integer> siteIds);
    List<Map<String, Object>> getWeekData(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end, @Param("siteIds") List<Integer> siteIds);

    List<Map<String, Object>> getYearData(@Param("start")LocalDateTime start,@Param("end")LocalDateTime end,@Param("siteIds")List<Integer> siteIds);
    List<Map<String, Object>> getMonthData(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end, @Param("siteIds") List<Integer> siteIds);

    List<ChargingOrderListVO> chargingList(@Param("req") ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2);
    List<Map<String, Object>> getYearData(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end, @Param("siteIds") List<Integer> siteIds);

    List<Map<String, Object>> chargingList1(@Param("pageInfo")PageInfo<ChargingOrderListVO> pageInfo, @Param("req") ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2);
    List<Map<String, Object>> chargingListAccountingSummary(@Param("orderIds") List<Long> orderIds);
    List<ChargingOrderListVO> chargingList(@Param("req") ChargingListQuery dto, @Param("startTime1") String startTime1, @Param("startTime2") String startTime2, @Param("endTime1") String endTime1, @Param("endTime2") String endTime2);

    List<Map<String, Object>> chargingList1(@Param("pageInfo") PageInfo<ChargingOrderListVO> pageInfo, @Param("req") ChargingListQuery dto, @Param("startTime1") String startTime1, @Param("startTime2") String startTime2, @Param("endTime1") String endTime1, @Param("endTime2") String endTime2);

    List<Map<String, Object>> chargingListAccountingSummary(@Param("orderIds") List<Long> orderIds);


    Map<String, Object> chargingListSum(@Param("req") ChargingListQuery dto, @Param("startTime1") String startTime1, @Param("startTime2") String startTime2, @Param("endTime1") String endTime1, @Param("endTime2") String endTime2);

    Map<String, Object> chargingListSum(@Param("req") ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2);
    List<Long> chargingListSummaryOrderIds(@Param("req") ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2);
    List<Long> chargingListSummaryOrderIds(@Param("req") ChargingListQuery dto, @Param("startTime1") String startTime1, @Param("startTime2") String startTime2, @Param("endTime1") String endTime1, @Param("endTime2") String endTime2);


    List<ChargingOrderListVO> chargingListNoPage( @Param("req")ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2);
    List<ChargingOrderListVO> chargingListNoPage(@Param("req") ChargingListQuery dto, @Param("startTime1") String startTime1, @Param("startTime2") String startTime2, @Param("endTime1") String endTime1, @Param("endTime2") String endTime2);

    List<Map<String, Object>> getByDate(@Param("start")LocalDateTime start,@Param("end")LocalDateTime end,@Param("siteIds")List<Integer> siteIds);
    List<Map<String, Object>> getByDate(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end, @Param("siteIds") List<Integer> siteIds);

    List<Map<String, Object>> queryPower(@Param("siteIds")List<Integer> siteIds);
    List<Map<String, Object>> queryPower(@Param("siteIds") List<Integer> siteIds);

    Map<String, Object> queryPowerLevel(@Param("siteIds") List<Integer> siteIds,@Param("statisticsQueryDto")  ChargingStatisticsQueryDto statisticsQueryDto);
    Map<String, Object> queryPowerLevel(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);


    List<Map<String, Object>> usersDay(@Param("statisticsQueryDto")ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> usersDay(@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    List<Map<String, Object>> usersDay1();

    List<Map<String, Object>> usersByQuery(@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> usersByQuery1(@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> usersByQuery(@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    List<Map<String, Object>> usersByQuery1(@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    List<Map<String, Object>> getUserTagCount();

    List<Map<String, Object>> getVipCount();
    List<Map<String, Object>> getVipCount();

    List<Map<String, Object>> unitConsumption(@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    List<Map<String, Object>> carUserMethod();

    List<Map<String, Object>> carUserBrand();
    List<Map<String, Object>> carUserBrand();

    Map<String, Object> countLocalCar();
    Map<String, Object> countLocalCar();

    Double getAver(@Param("siteIds") List<Integer> siteIds);
    Double getAver(@Param("siteIds") List<Integer> siteIds);

    List<Map<String, Object>> getLevelEvaluate(@Param("siteIds")List<Integer> siteIds);
    List<Map<String, Object>> getLevelEvaluate(@Param("siteIds") List<Integer> siteIds);

    List<Map<String, Object>> countBySource(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> countBySource(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    List<Map<String, Object>> equipmentUserType1(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> equipmentUserType1(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    List<Map<String, Object>> equipmentUserType2(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> equipmentUserType2(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    List<Map<String, Object>> equipmentMapbroke1(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto")ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> equipmentMapbroke1(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    List<Map<String, Object>> equipmentMapbroke2(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto")ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> equipmentMapbroke2(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    List<Map<String, Object>> equipmentMapOut1(@Param("siteIds")List<Integer> siteIds, @Param("statisticsQueryDto")ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> equipmentMapOut1(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    List<Map<String, Object>> equipmentMapOut2(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> equipmentMapOut2(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    List<Map<String, Object>> needElec(@Param("siteIds")List<Integer> siteIds, @Param("statisticsQueryDto")ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> needElec(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    Map<String, Object> getChargingOrderCount(@Param("siteIds") List<Integer> siteIds, @Param("time") String time);

@@ -204,82 +220,89 @@
                                                    @Param("endTime") String endTime);


    List<Map<String, Object>> getHourType(@Param("siteIds")List<Integer> siteIds, @Param("statisticsQueryDto")ChargingDetailQueryDto statisticsQueryDto);
    List<Map<String, Object>> getHourType(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingDetailQueryDto statisticsQueryDto);

    List<Map<String, Object>> getDateType(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto") ChargingDetailQueryDto statisticsQueryDto);
    List<Map<String, Object>> getDateType(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingDetailQueryDto statisticsQueryDto);

    List<Map<String, Object>> getMonthType(@Param("siteIds")List<Integer> siteIds, @Param("statisticsQueryDto")ChargingDetailQueryDto statisticsQueryDto);
    List<Map<String, Object>> getMonthType(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingDetailQueryDto statisticsQueryDto);

    List<Map<String, Object>> getchargingCapacity(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto") ChargingDetailQueryDto statisticsQueryDto);
    List<Map<String, Object>> getchargingCapacity(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingDetailQueryDto statisticsQueryDto);

    List<Map<String, Object>> countAllUserData();
    List<Map<String, Object>> countAllUserData();

    List<Map<String, Object>> needElec1(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto")  ChargingStatisticsQueryDto statisticsQueryDto);
    List<Map<String, Object>> needElec1(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);

    Long countNoTag();
    Long countNoTag();

    Long countCar(@Param("brands") List<String> brands);

    List<OrderCountByDate> countOrdersByDate(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime,@Param("gunIds")List<Integer> gunIds);
    List<OrderCountByDate> countOrdersByDate(@Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime, @Param("gunIds") List<Integer> gunIds);

    Double getSumDegreeBySiteIds(@Param("siteIds") List<Integer> siteIds);
    Double getSumDegreeBySiteIds(@Param("siteIds") List<Integer> siteIds);

    List<Long> getAppUserIdsBySiteIds(@Param("siteIds") List<Integer> siteIds);
	
	
    /**
     * 获取启动失败且时间超过1小时的订单
     * @return
     */
    List<TChargingOrder> findFailedStartupOrder();
	
	
    /**
     * 获取停止中的数据
     * @return
     */
    List<TChargingOrder> findStoppedOrder();
	
	
    /**
     * 获取充电中的订单
     * @return
     */
    List<TChargingOrder> findChargingOrder();
    List<Long> getAppUserIdsBySiteIds(@Param("siteIds") List<Integer> siteIds);


    /**
     * 获取已结束的数据
     * @return
     */
    List<TChargingOrder> findEndChargingOrder();
    /**
     * 获取启动失败且时间超过1小时的订单
     *
     * @return
     */
    List<TChargingOrder> findFailedStartupOrder();


    /**
     * 获取需要手动修改订单状态的数据
     * @return
     */
    List<TChargingOrder> findUpStatusChargingOrder();
    /**
     * 获取停止中的数据
     *
     * @return
     */
    List<TChargingOrder> findStoppedOrder();


    /**
     * 查询充电算账单数据
     * @param startTime
     * @param endTime
     */
    List<Map<String, Object>> getChargingSettlementBill(@Param("startTime") String startTime, @Param("endTime") String endTime,
                                                       @Param("dateType") Integer dateType);

    List<Map<String, Object>> queryChargingBillIncome(@Param("billingCycles") List<String> billingCycles,
                                                      @Param("dateType") Integer dateType,
                                                      @Param("siteIds") List<Integer> siteIds);
    /**
     * 获取充电中的订单
     *
     * @return
     */
    List<TChargingOrder> findChargingOrder();


    /**
     * 查询账户结算账单数据
     * @param startTime
     * @param endTime
     */
    List<Map<String, Object>> getAccountSettlementStatement(@Param("startTime") String startTime,
                                                            @Param("endTime") String endTime);
    /**
     * 获取已结束的数据
     *
     * @return
     */
    List<TChargingOrder> findEndChargingOrder();


    /**
     * 获取需要手动修改订单状态的数据
     *
     * @return
     */
    List<TChargingOrder> findUpStatusChargingOrder();


    /**
     * 查询充电算账单数据
     *
     * @param startTime
     * @param endTime
     */
    List<Map<String, Object>> getChargingSettlementBill(@Param("startTime") String startTime, @Param("endTime") String endTime,
                                                        @Param("dateType") Integer dateType);

    List<Map<String, Object>> queryChargingBillIncome(@Param("billingCycles") List<String> billingCycles,
                                                      @Param("dateType") Integer dateType,
                                                      @Param("siteIds") List<Integer> siteIds);


    /**
     * 查询账户结算账单数据
     *
     * @param startTime
     * @param endTime
     */
    List<Map<String, Object>> getAccountSettlementStatement(@Param("startTime") String startTime,
                                                            @Param("endTime") String endTime);
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

Diff too large

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TChargingOrderMapper">

@@ -2344,17 +2344,12 @@
            b.id,
            CASE WHEN count(a.id) > 0 THEN (UNIX_TIMESTAMP(MAX(b.end_time)) - UNIX_TIMESTAMP(MAX(b.start_time))) ELSE 0 END as time,
            sum(a.charging_capacity) as total,
            sum(CASE WHEN b.refund_status = 2 THEN 0 ELSE a.period_electric_price END) as electronicMoney,
            sum(a.period_electric_price) as electronicMoney,
            sum(CASE
                    WHEN b.refund_status = 2 THEN 0
                    WHEN b.order_source = 1 THEN a.period_service_price
                    ELSE a.period_service_price * 0.8
                END) as serviceMoney,
            sum(CASE
                    WHEN b.refund_status = 2 THEN 0
                    ELSE a.period_electric_price
                        + CASE WHEN b.order_source = 1 THEN a.period_service_price ELSE a.period_service_price * 0.8 END
                END) as income,
            sum(a.period_electric_price + CASE WHEN b.order_source = 1 THEN a.period_service_price ELSE a.period_service_price * 0.8 END) as income,
            MAX(b.recharge_payment_type) as recharge_payment_type,
            MAX(b.is_whitelist) as is_whitelist,
            MAX(b.electrovalence) as electrovalence,