From 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 三月 2026 16:40:54 +0800
Subject: [PATCH] 合并
---
server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java | 10 ++++++++--
1 files changed, 8 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 3767b00..f47066a 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;
@@ -110,7 +111,7 @@
PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap);
PageData<Goodsorder> findPageShop(PageWrap<Goodsorder> pageWrap);
- List<Goodsorder> exportExcel(Goodsorder goodsorder);
+ List<GoodsorderExport> exportExcel(PageWrap<Goodsorder> goodsorder);
/**
* 鏉′欢缁熻
@@ -181,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);
/**
* 璁㈠崟鍒犻櫎
@@ -235,5 +238,8 @@
PageData<Goodsorder> shopOrderPage(PageWrap<ShopOrderRequest> pageWrap);
+ void orderRefund(Goodsorder goodsorder);
+
+ String createExchangeCode();
}
--
Gitblit v1.9.3