From a76e2318dd2731ff713df6e262396a9175d029f7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 09:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 e865893..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,11 +4,9 @@
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.OrderCancelRequest;
-import com.doumee.dao.web.request.OrderPayRequest;
-import com.doumee.dao.web.request.PayDetailRequest;
-import com.doumee.dao.web.request.ShopOrderPayRequest;
+import com.doumee.dao.web.request.*;
import com.doumee.dao.web.request.goods.DealOrderRequest;
import com.doumee.dao.web.request.goods.MemberOrderRequest;
import com.doumee.dao.web.request.goods.OrderCommentRequest;
@@ -69,7 +67,7 @@
void orderSendOutGoods(Goodsorder goodsorder);
void orderRemark(Goodsorder goodsorder);
- IPage<Shop> getShopPage(PageWrap<Shop> pageWrap);
+// IPage<Shop> getShopPage(PageWrap<Shop> pageWrap);
void coffeePlanCancelOrder(Goodsorder goodsorder);
void orderPlanCancelOrder(Goodsorder goodsorder);
@@ -111,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);
/**
* 鏉′欢缁熻
@@ -183,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);
/**
* 璁㈠崟鍒犻櫎
@@ -228,4 +229,14 @@
OrderPayConfirmResponse orderPayConfirm(OrderPayConfirmRequest request,
MemberCouponServiceImpl memberCouponService);
+
+ /**
+ * 缁忛攢鍟嗚鍗曞垪琛�
+ * @param pageWrap
+ * @return
+ */
+ PageData<Goodsorder> shopOrderPage(PageWrap<ShopOrderRequest> pageWrap);
+
+
+ void orderRefund(Goodsorder goodsorder);
}
--
Gitblit v1.9.3