From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/RefundPassService.java |   43 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/RefundPassService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/RefundPassService.java
index d771ad7..948c675 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/RefundPassService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/RefundPassService.java
@@ -2,9 +2,16 @@
 
 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.RefundPass;
 import com.ruoyi.order.vo.ApplyRefundPass;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.ruoyi.order.vo.OrderRefundPassList;
+import com.ruoyi.order.vo.OrderRefundPassListVo;
+import com.ruoyi.order.vo.RefundPassInfo;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 /**
  * <p>
@@ -22,5 +29,37 @@
 	 * @return
 	 */
 	R applyRefundPass(ApplyRefundPass applyRefundPass);
-
+	
+	
+	/**
+	 * 管理后台获取售后管理列表数据
+	 * @return
+	 */
+	PageInfo<OrderRefundPassList> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo);
+	
+	
+	/**
+	 * 售后订单审核操作
+	 * @param id
+	 * @param status
+	 * @param passRemark
+	 * @return
+	 */
+	R authPassStatus(Long id, Integer status, String passRemark);
+	
+	
+	/**
+	 * 售后确认收货操作
+	 * @param id
+	 * @return
+	 */
+	R refundPassReceive(Long id);
+	
+	
+	/**
+	 * 获取售后详情
+	 * @param id
+	 * @return
+	 */
+	RefundPassInfo getRefundPassInfo(Long id);
 }

--
Gitblit v1.7.1