From 8c2a413d2574151a2bc762aa0779f766de48160b Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 18:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 5 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 0961a26..e4474a9 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,9 +1,10 @@
package com.ruoyi.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.vo.OrderDetailVO;
-import com.ruoyi.order.vo.OrderVO;
-import model.Order;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.model.Order;
+import com.ruoyi.order.vo.*;
+import org.springframework.web.bind.annotation.PathVariable;
import java.util.List;
@@ -16,9 +17,59 @@
* @since 2024-11-21
*/
public interface OrderService extends IService<Order> {
- List<OrderVO> getOrderList(Integer status);
+ List<OrderVO> selectOrderListByUserId(Integer status,Long userId);
OrderDetailVO getOrderDetail(Long orderId);
- boolean check(Long orderId, Long shopId);
+ boolean check(Order order, Integer shopId, Long userId);
+
+ void writeOff(String code,Integer shopId);
+
+
+ /**
+ * 获取管理后台订单列表数据
+ * @param orderPageList
+ * @return
+ */
+ List<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
+
+
+ /**
+ * 确认发货操作
+ * @param orderId
+ * @param code
+ * @return
+ */
+ R confirmDelivery(String orderId, String code);
+
+
+ /**
+ * 取消订单操作
+ * @param orderId
+ * @return
+ */
+ R cancelOrder(Long orderId);
+
+
+ /**
+ * 返回订单支付金额和回退积分和会员等级
+ * @param order
+ */
+ void refundPayMoney(Order order);
+
+
+ /**
+ * 收货操作
+ * @param orderId
+ * @return
+ */
+ R receivingOperation(Long orderId);
+
+
+ /**
+ * 获取订单详情
+ * @param orderId
+ * @return
+ */
+ OrderInfoVo getOrderInfo(Long orderId);
}
--
Gitblit v1.7.1