From 905077448a20fe1f06c9303152e83a6c9463541c Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 10 四月 2025 19:21:54 +0800
Subject: [PATCH] 商家端
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 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..d176d94 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,10 +1,12 @@
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;
@@ -25,7 +27,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 +106,26 @@
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);
}
--
Gitblit v1.7.1