Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-31 2e43d137c7832e149f3df4145aa7fcca2153ef9c

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java

@@ -1,15 +1,23 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TChargingOrderRefund;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.vo.ChargingOrderTimeVO;
import com.ruoyi.order.api.vo.ChargingOrderVO;
import com.ruoyi.order.api.vo.TCharingOrderVO;
import com.ruoyi.order.dto.*;
import org.springframework.web.bind.annotation.RequestBody;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;

@@ -82,5 +90,29 @@
    */
   AjaxResult stopCharging(String id);

    PageInfo<ChargingOrderVO> chargingOrder(ChargingOrderQuery dto);
   TCharingOrderVO chargingOrder(ChargingOrderQuery dto);

   R<PageInfo<PayOrderDto>> payOrderQuery(PayOrderQueryDto payOrderQueryDto);

    R<PageInfo<TChargingOrderRefund>> getRefundList(ChargingRefundDto chargingRefundDto);

    List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto);

   List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds);

   List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);

   Map<String, BigDecimal> countAll(LocalDate sixBefore);

    List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds);

   List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds);

   List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds);

   List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds);

   List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);

    ChargingOrderTimeVO chargingList(ChargingListQuery dto);
}