From 7c220e1e14cb099ac6b7f08b911b037b79cf9da8 Mon Sep 17 00:00:00 2001 From: zhibing.pu <393733352@qq.com> Date: 星期四, 22 八月 2024 17:39:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 70 +++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java index 5650b83..06c75b4 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java @@ -1,7 +1,17 @@ package com.ruoyi.order.service; 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; + +import java.util.List; +import java.util.Map; /** * <p> @@ -12,5 +22,65 @@ * @since 2024-08-07 */ public interface TChargingOrderService extends IService<TChargingOrder> { + + + /** + * 获取小程序充电记录列表数据 + * @param query + * @return + */ + Map<String, Object> getMyChargingOrderList(GetMyChargingOrderList query); + + + /** + * 获取小程序充电记录明细 + * @param id + * @return + */ + MyChargingOrderInfo getMyChargingOrderInfo(String id); + + + /** + * 获取待开票订单列表 + * @param query + * @return + */ + List<MyChargingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query); + + + /** + * 充电支付 + * @param addChargingOrder + * @return + */ + AjaxResult paymentChargingOrder(AddChargingOrder addChargingOrder); + + + /** + * 支付成功后的回调处理逻辑 + * @param paymentType 支付方式:1=微信,2=支付宝 + * @param out_trade_no 业务流水号 + * @param transaction_id 三方支付流水号 + * @param attach 附加数据 + * @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); } -- Gitblit v1.7.1