From 0a32ecc49bc4acd885096562e809381d28b3d1d7 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 14:37:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 3575abe..df5281e 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
@@ -15,6 +15,7 @@
import com.ruoyi.order.api.vo.ChargingOrderVO;
import com.ruoyi.order.api.vo.TCharingOrderVO;
import com.ruoyi.order.dto.*;
+import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import org.springframework.web.bind.annotation.RequestBody;
import java.math.BigDecimal;
@@ -85,9 +86,9 @@
* @return
*/
AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time);
-
-
-
+
+
+
/**
* 获取充电中的详情
* @param id
@@ -128,8 +129,12 @@
List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);
ChargingOrderTimeVO chargingList(ChargingListQuery dto);
-
-
+
+ R payRefund(PayOrderRefundDto payOrderQueryDto);
+
+ ChargingOrderListInfoVO chargingInfo(String uid);
+
+
/**
* 处理充电订单实时监控数据相关的业务逻辑
* @param query
--
Gitblit v1.7.1