From ec6d43aa07ee0e8faf34498057ebcfbb446aa015 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 16 七月 2024 09:21:51 +0800
Subject: [PATCH] feat: 代码重构
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/OrderService.java | 73 +-----------------------------------
1 files changed, 3 insertions(+), 70 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/OrderService.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/OrderService.java
index d3ce92f..ce42946 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/OrderService.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/OrderService.java
@@ -1,19 +1,11 @@
package com.ruoyi.admin.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.admin.entity.Order;
-import com.ruoyi.admin.request.OrderCountRequest;
-import com.ruoyi.admin.request.OrderQueryRequest;
-import com.ruoyi.admin.vo.OrderCountVO;
import com.ruoyi.admin.vo.OrderDetailVO;
-import com.ruoyi.admin.vo.OrderPageCountVO;
-import com.ruoyi.admin.vo.OrderResultVO;
import com.ruoyi.common.core.domain.R;
import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
import java.util.List;
/**
@@ -27,55 +19,13 @@
public interface OrderService extends IService<Order> {
/**
- * 回收订单统计
- *
- * @param orderCount 查询所需参数
- * @return 柱状图数据
- */
- OrderResultVO orderCountHome(OrderCountRequest orderCount);
-
- /**
- * 查询整个季度的交易额(订单状态为:已完工)
- *
- * @param startDateStr 季度开始时间
- * @param endDateStr 季度结束时间
- * @param cityList 城市列表
- * @return 总交易额
- */
- BigDecimal totalMoneyByQuarter(String startDateStr, String endDateStr, List<String> cityList);
-
- /**
- * 查询整个年度的交易额(订单状态为:已完工)
- *
- * @param cityList 城市列表
- * @return 总交易额
- */
- BigDecimal totalMoneyByYear(List<String> cityList);
-
- /**
- * 查询整个月度的交易额(订单状态为:已完工)
- *
- * @param cityList 城市列表
- * @return 总交易额
- */
- BigDecimal totalMoneyByMonth(List<String> cityList);
-
- /**
* excel模板导出
*
- * @param orderQueryRequest 筛选参数
- * @param response 响应体
+ * @param orderList 订单列表
+ * @param response 响应体
* @return 导出结果
*/
- R<String> excelExport(OrderQueryRequest orderQueryRequest, HttpServletResponse response);
-
- /**
- * 订单列表
- *
- * @param orderQueryRequest 订单列表查询参数
- * @return 分页
- */
- IPage<Order> queryPage(OrderQueryRequest orderQueryRequest);
+ R<String> excelExport(List<com.ruoyi.order.api.entity.Order> orderList, HttpServletResponse response);
/**
* 订单列表-查询订单详情(包含服务信息、师傅信息、服务记录、订单评价)
@@ -85,21 +35,4 @@
*/
OrderDetailVO orderListDetail(String id);
- /**
- * 订单管理-订单统计
- *
- * @param name 师傅姓名
- * @param phone 师傅电话
- * @param page 分页
- * @return 分页统计
- */
- IPage<OrderCountVO> orderCount(String name, String phone, Page<OrderCountVO> page);
-
- /**
- * 订单管理分页模块，订单数量统计
- *
- * @param orderQueryRequest 筛选参数
- * @return 统计数量
- */
- OrderPageCountVO orderPageCount(OrderQueryRequest orderQueryRequest);
}
--
Gitblit v1.7.1