Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-22 7c220e1e14cb099ac6b7f08b911b037b79cf9da8

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

@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.vo.ChargingOrderVO;
import com.ruoyi.order.dto.*;
import org.springframework.web.bind.annotation.RequestBody;

@@ -62,4 +65,22 @@
    * @return
    */
   AjaxResult chargingOrderCallback(Integer paymentType, String out_trade_no, String transaction_id, String attach);
	
	
   /**
    * 获取充电中的详情
    * @param id
    * @return
    */
   ChargingDetails getChargingDetails(Integer id);
	
	
   /**
    * 停止充电
    * @param id
    * @return
    */
   AjaxResult stopCharging(String id);

    PageInfo<ChargingOrderVO> chargingOrder(ChargingOrderQuery dto);
}