Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-02 c81e1267ee71da9bbf345ab2788deb3a65dbcd8c

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

@@ -10,10 +10,12 @@
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.query.UploadRealTimeMonitoringDataQuery;
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 com.ruoyi.order.vo.ChargingOrderListInfoVO;
import org.springframework.web.bind.annotation.RequestBody;

import java.math.BigDecimal;
@@ -76,6 +78,18 @@
   
   
   /**
    * 充电启动失败后的退款回调处理
    * @param out_refund_no
    * @param refund_id
    * @param tradeState
    * @param success_time
    * @return
    */
   AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time);



   /**
    * 获取充电中的详情
    * @param id
    * @return
@@ -115,4 +129,13 @@
   List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);

    ChargingOrderTimeVO chargingList(ChargingListQuery dto);

   ChargingOrderListInfoVO chargingInfo(String uid);


   /**
    * 处理充电订单实时监控数据相关的业务逻辑
    * @param query
    */
   void chargeMonitoring(UploadRealTimeMonitoringDataQuery query);
}