From 19df67e19f23cd2a04d1c7f355e1e656f4140af4 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 17 四月 2025 20:04:14 +0800
Subject: [PATCH] 后台:首页统计、系统管理、广告管理、用户管理、商品分类管理

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
index 8342ff7..30207e3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
@@ -1,13 +1,17 @@
 package com.ruoyi.order.service;
 
+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.core.web.page.PageInfo;
 import com.ruoyi.order.model.Order;
 import com.ruoyi.order.util.payment.model.RefundCallbackResult;
+import com.ruoyi.order.util.payment.model.UniPayCallbackResult;
 import com.ruoyi.order.vo.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -25,7 +29,7 @@
 
     boolean check(Order order, Integer shopId, Long userId);
 
-    void writeOff(String id,Integer shopId, String technicianId);
+    void writeOff(String id,Integer shopId);
     
     
     /**
@@ -104,5 +108,31 @@
 
     Integer getShopSaleNumByShopIds(List<Integer> shopIds, Integer type);
 
+    /**
+     * 确认订单
+     */
     ConfirmOrderVo confirmOrder(Integer goodId,Integer type);
+
+    /**
+     * 订单支付
+     */
+    R orderPayment(OrderPayment orderPayment);
+
+    /**
+     * 订单支付回调通知
+     */
+    R orderPaymentCallback(UniPayCallbackResult uniPayCallbackResult);
+    /**
+     * 定时任务关闭订单
+     */
+    void closeOrder();
+
+    IPage<OrderPageListVo> getShopOrderList(String content, Integer status, Integer shopId, Integer pageNum, Integer pageSize);
+
+    R shopCancelOrder(Long orderId);
+
+    /**
+     * 后台-工作台,订单折线图
+     */
+    List<OrderStatisticsDetail> getOrderListGroupByDate(LocalDate startTime, LocalDate endTime);
 }

--
Gitblit v1.7.1