修改rocketmq连接方式和修改发起充电异常情况下将订单挂起的功能

Pu Zhibing

2025-04-30 1adec9fead03f0f788a73f9349ccba86569e31f3

 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,8 +16,11 @@
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.time.LocalDateTime;
import java.util.List;
import java.util.Map;

@@ -101,8 +101,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);

   /**
    * 获取充电中的详情
@@ -140,17 +149,17 @@

   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<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);

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

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

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

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

    ChargingOrderTimeVO chargingList(ChargingListQuery dto);

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

@@ -192,13 +195,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();
@@ -286,4 +288,35 @@
   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();
	
	
   /**
    *
    * 手动推送订单给第三方平台
    * @param code
    * @return
    */
   R pushOrderInfo(String code);
}