Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-09-07 4fd0278cda787a91eb35d95d6491f5485afe3e48

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

@@ -6,15 +6,15 @@
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.dto.SettlementConfirmAdd;
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.model.TSettlementConfirm;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.query.SettlementListQuery;
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.api.vo.*;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import org.springframework.web.bind.annotation.RequestBody;
@@ -156,13 +156,19 @@
    * @param orderCode
    */
   void excelEndCharge(String orderCode);
	
	


   /**
    * 根据车牌号和开始时间查询充电数据
    * @param query
    * @return
    */
   TChargingOrder getChargingOrderByLicensePlate(GetChargingOrderByLicensePlate query);
	


    TSettlementConfirm settlementAdd(SettlementConfirmAdd dto);

   PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);

    SettlementTotalVO settlementTotal(String time);
}