合并代码

Pu Zhibing

2024-10-16 c4664502dfdaffff555b532e65b51a57ac8b29c2

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

@@ -17,10 +17,8 @@
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 com.ruoyi.order.vo.EndOfChargePageInfo;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -80,6 +78,20 @@
   
   
   /**
    * 安全检测数据
    * @param securityDetection
    */
   void securityDetection(SecurityDetectionVO securityDetection);
	
	
   /**
    * 启动充电应发
    * @param message
    */
   void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
	
	
   /**
    * 充电启动失败后的退款回调处理
    * @param out_refund_no
    * @param refund_id
@@ -105,6 +117,15 @@
    * @return
    */
   AjaxResult stopCharging(String id);
	
	
   /**
    * 停止充电应答结果处理
    * @param platformStopChargingReply
    */
   void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply);
	
	

   TCharingOrderVO chargingOrder(ChargingOrderQuery dto);

@@ -149,7 +170,14 @@
    * @param code
    */
   void endCharge(String code, Integer endMode);

	
   /**
    * 停止充电返回账单后计算费用
    * @param vo
    */
   void endChargeBillingCharge(TransactionRecordMessageVO vo);
	
	

   /**
    * 异常结束充电处理逻辑
@@ -166,6 +194,7 @@
   List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);

   List<Map<String, Object>> usersDay();
   List<Map<String, Object>> usersDay1();

   List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);

@@ -214,4 +243,26 @@
   List<Map<String, Object>> equipmentMapOut1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);

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

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

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

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

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

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

   List<Map<String, Object>> countAllUserData();

   List<Map<String, Object>> needElec1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
	
	
   /**
    * 获取充电结束页面详情
    * @param id
    * @return
    */
   EndOfChargePageInfo getEndOfChargePageInfo(String id);
}