各类修复

longz

2026-07-29 607e4ab169b003991ed4788c9dbe0bd1fefc69f3

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

@@ -14,8 +14,12 @@
import com.ruoyi.order.api.vo.*;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.order.vo.ChargingSimulationVO;
import com.ruoyi.order.vo.IcbcAdminSubOrderVO;
import com.ruoyi.order.vo.EndOfChargePageInfo;
import com.ruoyi.order.vo.StatisticsOfBatteryVO;
import com.ruoyi.order.vo.LargeChargingPowerVo;
import com.ruoyi.order.vo.ReservationRecommendationVO;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

@@ -24,6 +28,9 @@
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import com.ruoyi.payment.api.vo.IcbcPaymentResp;
import com.ruoyi.payment.api.vo.IcbcRefundResp;
import com.ruoyi.payment.api.vo.IcbcSubOrderRefundResp;

/**
 * <p>
@@ -34,6 +41,8 @@
 * @since 2024-08-07
 */
public interface TChargingOrderService extends IService<TChargingOrder> {

   ReservationRecommendationVO getReservationRecommendation(Integer siteId);
   
   
   /**
@@ -66,6 +75,20 @@
    * @return
    */
   AjaxResult paymentChargingOrder(AddChargingOrder addChargingOrder);

   AjaxResult confirmIcbcPayment(String orderCode);

   ChargingSimulationVO getCurrentSimulationOrder(Integer gunId);

   ChargingSimulationVO completeSimulation(ChargingSimulationReq request);

   IcbcPaymentResp queryIcbcAdminPayment(String orderCode);

   IcbcRefundResp refundIcbcAdminPayment(IcbcAdminFundOperationReq request);

   List<IcbcAdminSubOrderVO> queryIcbcAdminSubOrders(String orderCode);

   IcbcSubOrderRefundResp refundIcbcAdminSubOrder(IcbcAdminFundOperationReq request);
   
   
   /**
@@ -144,17 +167,30 @@

   TCharingOrderVO chargingOrder(ChargingOrderQuery dto);

   PageInfo<ChargingOrderVO> chargingOrderList(ChargingOrderQuery dto);

   TCharingOrderVO chargingOrderSummary(ChargingOrderQuery dto);

   List<ChargingOrderBalanceIncomeDetailVO> balanceIncomeDetail(ChargingOrderQuery dto);

   R<PageInfo<PayOrderDto>> payOrderQuery(PayOrderQueryDto payOrderQueryDto);
   R<PageInfo<EnterpriseChargingAnalysisVO>> enterpriseChargingAnalysis(EnterpriseChargingAnalysisQuery query);

   R<PageInfo<EnterpriseChargingDetailVO>> enterpriseChargingDetail(EnterpriseChargingAnalysisQuery query);

   List<EnterpriseChargingDetailVO> enterpriseChargingDetailExport(EnterpriseChargingAnalysisQuery query);

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

    List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto);

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

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

   Map<String, Object> countAll(List<Integer> siteIds);
   Map<String, Object> countAll(List<Integer> siteIds, Boolean partnerView);

   List<SixIncomeCircleDto> payTypeCircle(LocalDate sixBefore, List<Integer> siteIds, Boolean partnerView);

    List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);

@@ -168,11 +204,21 @@

    ChargingOrderTimeVO chargingList(ChargingListQuery dto);

    PageInfo<ChargingOrderListVO> chargingListPage(ChargingListQuery dto);

    ChargingOrderTimeVO chargingListSummary(ChargingListQuery dto);


   List<ChargingOrderListVO> export(ChargingListQuery dto);


   R payRefund(PayOrderRefundDto payOrderQueryDto);

   R<PayOrderInfoDto> getSpecialRefundOrder(PayOrderRefundDto payOrderQueryDto);

   R specialRefund(PayOrderRefundDto payOrderQueryDto);

   BigDecimal getManualRefundableAmount(Long chargingOrderId);

   ChargingOrderListInfoVO chargingInfo(String uid);

@@ -268,6 +314,12 @@

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

    Map<String, Object> getLargeScreenSummary(List<Integer> siteIds);

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

    List<LargeChargingPowerVo> getLargeScreenChargingPower(List<Integer> siteIds, LocalDateTime startTime, LocalDateTime endTime);


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

@@ -338,9 +390,14 @@
   /**
    * 大屏-新能源汽车电池安全检测次数统计
    */
    R<StatisticsOfBatteryVO> getStatisticsOfBattery();
    R<StatisticsOfBatteryVO> getStatisticsOfBattery(List<Integer> siteIds);

   Double getSumDegreeBySiteIds(List<Integer> siteIds);

   /**
    * 查询指定站点中实际发生过充电的用户ID
    */
   List<Long> getAppUserIdsBySiteIds(List<Integer> siteIds);
   
   /**
    * 获取启动失败且时间超过1小时的订单
@@ -390,7 +447,7 @@
    * @param endTime
    * @return
    */
   List<Map<String, Object>> getAccountSettlementStatement(String startTime, String endTime, Integer rechargePaymentType);
   List<Map<String, Object>> getAccountSettlementStatement(String startTime, String endTime);

    /**
     * 手动处理退款数据