修改bug

Pu Zhibing

2025-01-26 1266ed302b259f09a9370bc4315316b8a212b5d0

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

@@ -7,10 +7,7 @@
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.model.*;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.query.SettlementListQuery;
import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
@@ -19,7 +16,9 @@
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.order.vo.EndOfChargePageInfo;
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;
@@ -140,7 +139,7 @@

   List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);

   Map<String, Object> countAll(LocalDate sixBefore);
   Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds);

    List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);

@@ -177,6 +176,12 @@
    * @param vo
    */
   void endChargeBillingCharge(TransactionRecordMessageVO vo);
	
//   /**
//    * 停止充电返回账单后计算费用
//    * @param vo
//    */
//   void endChargeBillingCharge1(TransactionRecordMessageVO vo);
   
   

@@ -280,4 +285,19 @@
   List<TChargingOrder> getChargingOrder(TChargingOrderVo order);

    Long countCar(List<String> brands);
	
	
   /**
    * 添加三方平台充电订单数据
    * @param query
    */
   R addTripartitePlatformOrder(AddTripartitePlatformOrder query);
	
	
   /**
    * 三方平台停止充电操作
    * @param startChargeSeq
    * @return
    */
   R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq);
}