Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2026-05-22 6912e074af61b73307d2fc31b1b8f4974f5eb4f3

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

@@ -128,8 +128,12 @@
    * @return
    */
   AjaxResult stopCharging(String id);
	
	


   void editUserTag(TChargingOrder chargingOrder);

   void referralReward(TChargingOrder chargingOrder);

   /**
    * 停止充电应答结果处理
    * @param platformStopChargingReply
@@ -139,6 +143,8 @@
   

   TCharingOrderVO chargingOrder(ChargingOrderQuery dto);

   List<ChargingOrderBalanceIncomeDetailVO> balanceIncomeDetail(ChargingOrderQuery dto);

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

@@ -152,6 +158,8 @@

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

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

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

   List<Map<String, Object>> getDateData(LocalDate start,LocalDate end,List<Integer> siteIds);
@@ -163,6 +171,10 @@
   List<Map<String, Object>> getYearData(LocalDate start,LocalDate end,List<Integer> siteIds);

    ChargingOrderTimeVO chargingList(ChargingListQuery dto);


   List<ChargingOrderListVO> export(ChargingListQuery dto);


   R payRefund(PayOrderRefundDto payOrderQueryDto);

@@ -258,6 +270,9 @@

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

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


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

   List<Map<String, Object>> getDateType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);
@@ -329,7 +344,7 @@
    */
    R<StatisticsOfBatteryVO> getStatisticsOfBattery();

   BigDecimal getSumDegreeBySiteIds(List<Integer> siteIds);
   Double getSumDegreeBySiteIds(List<Integer> siteIds);
   
   /**
    * 获取启动失败且时间超过1小时的订单
@@ -349,4 +364,48 @@
    * @return
    */
   List<TChargingOrder> findChargingOrder();

   /**
    * 获取已结束的数据
    * @return
    */
   List<TChargingOrder> findEndChargingOrder();

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



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


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

    /**
     * 手动处理退款数据
     * @param refund_out_trade_no 退款商户单号
     */
    void orderQueryRefund(Long orderId, String refund_out_trade_no);


    /**
     * 手动添加完善订单费用明细
     * @param orderId
     */
    void addOrderExpenseBreakdown(Long orderId);
}