From 8c16911f9f6b339f1373b89822455561f40ff80c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 04 九月 2024 10:45:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 5ed6ce2..9be1b42 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -887,8 +887,6 @@
return this.baseMapper.getYearData(chargingOrderIds);
}
@Resource
- private IPartnerService partnerService;
- @Resource
private SysUserClient sysUserClient;
@Resource
private UserSiteClient userSiteClient;
@@ -1067,6 +1065,12 @@
}
@Override
+ public R payRefund(PayOrderRefundDto payOrderQueryDto) {
+ return null;
+ }
+
+
+ @Override
public ChargingOrderListInfoVO chargingInfo(String uid) {
TChargingOrder chargingOrder= this.getById(uid);
--
Gitblit v1.7.1