Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2026-05-22 6912e074af61b73307d2fc31b1b8f4974f5eb4f3

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

@@ -15,11 +15,13 @@
import com.ruoyi.order.dto.*;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.order.vo.EndOfChargePageInfo;
import com.ruoyi.order.vo.StatisticsOfBatteryVO;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;

@@ -100,8 +102,17 @@
    * @return
    */
   AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time);


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

   /**
    * 获取充电中的详情
@@ -117,8 +128,12 @@
    * @return
    */
   AjaxResult stopCharging(String id);
	
	


   void editUserTag(TChargingOrder chargingOrder);

   void referralReward(TChargingOrder chargingOrder);

   /**
    * 停止充电应答结果处理
    * @param platformStopChargingReply
@@ -128,6 +143,8 @@
   

   TCharingOrderVO chargingOrder(ChargingOrderQuery dto);

   List<ChargingOrderBalanceIncomeDetailVO> balanceIncomeDetail(ChargingOrderQuery dto);

   R<PageInfo<PayOrderDto>> payOrderQuery(PayOrderQueryDto payOrderQueryDto);

@@ -139,19 +156,25 @@

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

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

    List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);
   List<SixIncomeCircleDto> payTypeCircle(LocalDate sixBefore, List<Integer> siteIds);

   List<Map<String, Object>> getDateData(List<Long> chargingOrderIds);
    List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);

   List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds);
   List<Map<String, Object>> getDateData(LocalDate start,LocalDate end,List<Integer> siteIds);

   List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds);
   List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end,List<Integer> siteIds);

   List<Map<String, Object>> getYearData(List<Long> chargingOrderIds);
   List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end,List<Integer> siteIds);

   List<Map<String, Object>> getYearData(LocalDate start,LocalDate end,List<Integer> siteIds);

    ChargingOrderTimeVO chargingList(ChargingListQuery dto);


   List<ChargingOrderListVO> export(ChargingListQuery dto);


   R payRefund(PayOrderRefundDto payOrderQueryDto);

@@ -175,13 +198,7 @@
    * 停止充电返回账单后计算费用
    * @param vo
    */
   void endChargeBillingCharge(TransactionRecordMessageVO vo);
	
//   /**
//    * 停止充电返回账单后计算费用
//    * @param vo
//    */
//   void endChargeBillingCharge1(TransactionRecordMessageVO vo);
   R endChargeBillingCharge(TransactionRecordMessageVO vo);
   
   

@@ -191,13 +208,12 @@
    */
   void excelEndCharge(String orderCode);

   List<Map<String, Object>> getByDate(List<Long> chargingOrderIds);
   List<Map<String, Object>> getByDate(LocalDate start,LocalDate end, List<Integer> siteIds);

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

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

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

   List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto);
   List<Map<String, Object>> usersDay1();
@@ -254,6 +270,9 @@

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

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


   List<Map<String, Object>> getHourType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);

   List<Map<String, Object>> getDateType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);
@@ -300,4 +319,93 @@
    * @return
    */
   R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq);
	
	
   /**
    * 获取充电后没有扣除费用的数据
    * @return
    */
   R getNotPaymentChargingOrder();
	
	
   /**
    *
    * 手动推送订单给第三方平台
    * @param code
    * @return
    */
   R pushOrderInfo(String code);
	
	
   R addChargingOrderSummaryData();

   /**
    * 大屏-新能源汽车电池安全检测次数统计
    */
    R<StatisticsOfBatteryVO> getStatisticsOfBattery();

   Double getSumDegreeBySiteIds(List<Integer> siteIds);
	
   /**
    * 获取启动失败且时间超过1小时的订单
    * @return
    */
   List<TChargingOrder> findFailedStartupOrder();
	
	
   /**
    * 获取停止中的数据
    * @return
    */
   List<TChargingOrder> findStoppedOrder();
	
   /**
    * 获取充电中的数据
    * @return
    */
   List<TChargingOrder> findChargingOrder();

   /**
    * 获取已结束的数据
    * @return
    */
   List<TChargingOrder> findEndChargingOrder();

   /**
    * 获取需要手动修改订单状态的数据
    * @return
    */
   List<TChargingOrder> findUpStatusChargingOrder();



   /**
    * 查询充电算账单数据
    * @param startTime
    * @param endTime
    * @param dateType
    */
   List<Map<String, Object>> getChargingSettlementBill(String startTime, String endTime, Integer dateType);


   /**
    * 查询账户结算账单数据
    * @param startTime
    * @param endTime
    * @return
    */
   List<Map<String, Object>> getAccountSettlementStatement(String startTime, String endTime, Integer rechargePaymentType);

    /**
     * 手动处理退款数据
     * @param refund_out_trade_no 退款商户单号
     */
    void orderQueryRefund(Long orderId, String refund_out_trade_no);


    /**
     * 手动添加完善订单费用明细
     * @param orderId
     */
    void addOrderExpenseBreakdown(Long orderId);
}