From fc9240bd6b246ad71c4050510880a49ce07138a3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 13 二月 2026 09:51:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji
---
server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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..a37c8c9 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);
/**
* 鏉′欢缁熻
@@ -180,7 +182,9 @@
*/
void affirmOrder(Integer orderId,Integer memberId);
- void orderWriteOff(String exchangeCode,Integer memberId);
+ void orderWriteOff(Integer orderId,Integer memberId);
+
+ MemberOrderResponse getGoodsOrderDetailByCode(String exchangeCode);
/**
* 璁㈠崟鍒犻櫎
@@ -234,5 +238,5 @@
PageData<Goodsorder> shopOrderPage(PageWrap<ShopOrderRequest> pageWrap);
-
+ void orderRefund(Goodsorder goodsorder);
}
--
Gitblit v1.9.3