From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TExchangeOrderService.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TExchangeOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TExchangeOrderService.java
index baf7452..56c3688 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TExchangeOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TExchangeOrderService.java
@@ -1,12 +1,17 @@
 package com.ruoyi.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.order.api.model.TExchangeOrder;
+import com.ruoyi.order.api.query.ShoppingOrderQuery;
 import com.ruoyi.order.dto.ExchangeOrderGoodsInfo;
 import com.ruoyi.order.dto.GetMyExchangeOrder;
 import com.ruoyi.order.dto.MyExchangeOrderList;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -24,7 +29,7 @@
 	 * @param query
 	 * @return
 	 */
-	List<MyExchangeOrderList> getMyExchangeOrder(GetMyExchangeOrder query);
+	Map<String, Object> getMyExchangeOrder(GetMyExchangeOrder query);
 	
 	
 	/**
@@ -33,4 +38,6 @@
 	 * @return
 	 */
 	ExchangeOrderGoodsInfo getGoodsExchangeOrder(String id);
+
+    PageInfo<TExchangeOrder> pageList(ShoppingOrderQuery query);
 }

--
Gitblit v1.7.1