Merge remote-tracking branch 'origin/master'

xuhy

2024-09-06 f2dff53d76a7e9a23e6a2ecfed58ce978dc41442

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

@@ -5,18 +5,20 @@
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.ChargingListQuery;
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.GetChargingOrderByLicensePlate;
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 org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;
import java.time.LocalDate;
@@ -140,4 +142,27 @@
    * @param query
    */
   void chargeMonitoring(UploadRealTimeMonitoringDataQuery query);


   /**
    * 自动结束充电后的处理逻辑
    * @param code
    */
   void endCharge(String code, Integer endMode);


   /**
    * 异常结束充电处理逻辑
    * @param orderCode
    */
   void excelEndCharge(String orderCode);
	
	
   /**
    * 根据车牌号和开始时间查询充电数据
    * @param query
    * @return
    */
   TChargingOrder getChargingOrderByLicensePlate(GetChargingOrderByLicensePlate query);
	
}