修改bug和漏洞修复

Pu Zhibing

2025-03-06 1b81b84edaeea9b200c622e4a34c49b4b1aaac92

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

@@ -7,16 +7,14 @@
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;
import com.ruoyi.order.api.vo.*;
import com.ruoyi.order.dto.*;
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;

@@ -83,14 +81,14 @@
    * 安全检测数据
    * @param securityDetection
    */
   void securityDetection(SecurityDetection securityDetection);
   void securityDetection(SecurityDetectionVO securityDetection);
   
   
   /**
    * 启动充电应发
    * @param message
    */
   void startChargeSuccessfully(PlatformStartChargingReplyMessage message);
   void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
   
   
   /**
@@ -102,8 +100,13 @@
    * @return
    */
   AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time);


	
	
   /**
    * 启动失败退款操作
    * @param code
    */
   void refund(String code);

   /**
    * 获取充电中的详情
@@ -119,6 +122,15 @@
    * @return
    */
   AjaxResult stopCharging(String id);
	
	
   /**
    * 停止充电应答结果处理
    * @param platformStopChargingReply
    */
   void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply);
	
	

   TCharingOrderVO chargingOrder(ChargingOrderQuery dto);

@@ -132,7 +144,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);

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

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

   /**
    * 异常结束充电处理逻辑
@@ -179,9 +198,11 @@

   List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);

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

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


   List<Map<String, Object>> getUserTagCount();
@@ -196,7 +217,7 @@

   Map<String, Object> countLocalCar();

    Long getAver(List<Integer> siteIds);
    Double getAver(List<Integer> siteIds);

   List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds);

@@ -214,8 +235,9 @@
   PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);

    SettlementTotalVO settlementTotal(String time);
    SettlementTotalVO settlementTotalR(String time,Long userId);

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

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

@@ -240,4 +262,48 @@
   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);

   Long countNoTag();
	
	
   /**
    * 获取订单数据
    * @param order
    * @return
    */
   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);
	
	
   /**
    * 获取充电后没有扣除费用的数据
    * @return
    */
   R getNotPaymentChargingOrder();
}