Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-24 404ae2f53b9107abc107fb56bb1c1d0e89e6363b

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

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

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

   /**
    * 异常结束充电处理逻辑
@@ -190,6 +197,7 @@
   List<Map<String, Object>> usersDay1();

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


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