From b876f27c592c5d44e4b32b79d4ef4bc25fe88603 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 20 七月 2025 15:21:04 +0800
Subject: [PATCH] Merge branch 'huliguo' of http://120.76.84.145:10101/gitblit/r/java/ZhengShengXinAdmin into huliguo
---
ruoyi-system/src/main/java/com/ruoyi/system/service/OrderService.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/OrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/OrderService.java
index 26852f2..ad09472 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/OrderService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/OrderService.java
@@ -3,12 +3,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.wx.RefundCallbackResult;
-import com.ruoyi.system.domain.Agreement;
+
+
import com.ruoyi.system.domain.Order;
-import com.ruoyi.system.pojo.dto.AddAgreementDTO;
+
+import com.ruoyi.system.pojo.dto.FinanceFlowsDTO;
import com.ruoyi.system.pojo.dto.OrderPageDTO;
+
import com.ruoyi.system.pojo.vo.*;
+
+import java.time.LocalDate;
public interface OrderService extends IService<Order> {
@@ -19,13 +23,13 @@
BusinessVO business(String id);
- ErrorVO error(String id);
+ R error(String id);
- ChangeVO change(String id);
+ R change(String id);
- TaxVO tax(String id);
+ R tax(String id);
- InvoiceVO invoice(String id);
+ R invoice(String id);
void delete(String id);
@@ -33,5 +37,14 @@
void cancel(String id);
- R refundPayMoneyCallback(RefundCallbackResult refundCallbackResult);
+ R refundPayMoneyCallback(String xmlData);
+
+ TodayStatisticsVO today();
+
+ IndexLineChartVO chart(LocalDate startDate, LocalDate endDate);
+
+ FinanceFlowsTopVO financeTop(FinanceFlowsDTO dto);
+
+ IPage<FinanceFlowsPageVO> flowsPage(FinanceFlowsDTO dto);
+
}
--
Gitblit v1.7.1