From 0982a97b0c65e11034b9d6b00cc0e4aba39254be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 26 一月 2026 11:07:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java
index 3a7e8ef..cc724e8 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -4,6 +4,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Goodsorder;
+import com.doumee.dao.business.model.GoodsorderExport;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.web.request.*;
import com.doumee.dao.web.request.goods.DealOrderRequest;
@@ -108,8 +109,9 @@
* @return PageData<Goodsorder>
*/
PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap);
+ PageData<Goodsorder> findPageShop(PageWrap<Goodsorder> pageWrap);
- List<Goodsorder> exportExcel(Goodsorder goodsorder);
+ List<GoodsorderExport> exportExcel(PageWrap<Goodsorder> goodsorder);
/**
* 鏉′欢缁熻
@@ -234,5 +236,5 @@
PageData<Goodsorder> shopOrderPage(PageWrap<ShopOrderRequest> pageWrap);
-
+ void orderRefund(Goodsorder goodsorder);
}
--
Gitblit v1.9.3