From d51a8cfa10c34d9c1e7d6b4726d31e75ecee5dc6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 20 十二月 2024 18:32:03 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 4ee3d67..0d0cb47 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
@@ -2,6 +2,7 @@
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.vo.*;
import org.springframework.web.bind.annotation.PathVariable;
@@ -31,7 +32,7 @@
* @param orderPageList
* @return
*/
- List<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
+ PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
/**
@@ -40,7 +41,7 @@
* @param code
* @return
*/
- R confirmDelivery(String orderId, String code);
+ R confirmDelivery(Long orderId, String code);
/**
@@ -52,6 +53,13 @@
/**
+ * 返回订单支付金额和回退积分和会员等级
+ * @param order
+ */
+ void refundPayMoney(Order order);
+
+
+ /**
* 收货操作
* @param orderId
* @return
--
Gitblit v1.7.1