Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-11 bd97f8c5cd9be78abfaaab295319bd7ceef98f11

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

@@ -17,10 +17,6 @@
import com.ruoyi.order.api.vo.*;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -80,6 +76,20 @@
   
   
   /**
    * 安全检测数据
    * @param securityDetection
    */
   void securityDetection(SecurityDetectionVO securityDetection);
	
	
   /**
    * 启动充电应发
    * @param message
    */
   void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
	
	
   /**
    * 充电启动失败后的退款回调处理
    * @param out_refund_no
    * @param refund_id
@@ -106,6 +116,15 @@
    */
   AjaxResult stopCharging(String id);

	
   /**
    * 停止充电应答结果处理
    * @param platformStopChargingReply
    */
   void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply);
	
	

   TCharingOrderVO chargingOrder(ChargingOrderQuery dto);

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