From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 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 aafeadc..3a7e8ef 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
@@ -5,14 +5,17 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Shop;
-import com.doumee.dao.web.request.OrderPayRequest;
-import com.doumee.dao.web.request.PayDetailRequest;
+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;
+import com.doumee.dao.web.request.goods.OrderPayConfirmRequest;
+import com.doumee.dao.web.response.HomeInfoResponse;
import com.doumee.dao.web.response.MyPageResponse;
import com.doumee.dao.web.response.goods.MemberOrderResponse;
+import com.doumee.dao.web.response.goods.OrderPayConfirmResponse;
import com.doumee.dao.web.response.goods.PayResponse;
+import com.doumee.service.business.impl.MemberCouponServiceImpl;
import java.math.BigDecimal;
import java.util.List;
@@ -63,7 +66,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);
@@ -123,7 +126,7 @@
* @param orderPayRequest
* @return
*/
- PayResponse orderPay(OrderPayRequest orderPayRequest);
+ PayResponse orderPay(ShopOrderPayRequest orderPayRequest, MemberCouponServiceImpl memberCouponService);
/**
* 閲嶆柊鏀粯
@@ -147,13 +150,20 @@
void updAddress(DealOrderRequest updAddressRequest);
/**
- * 鍙栨秷璁㈠崟
+ * 鍙栨秷璁㈠崟 - 鍘嗗彶鐗堟湰
* @param orderId
* @param optUserId
* @param cancelInfo
*/
void cancelOrder(Integer orderId,Integer optUserId,String cancelInfo);
+ /**
+ * 璁㈠崟鍙栨秷 - 鏂�
+ * @param orderId
+ * @param optUserId
+ * @param cancelInfo
+ */
+ void cancelOrderNew(Integer orderId,Integer optUserId,String cancelInfo);
/**
* 鍌彂璐�
@@ -170,6 +180,14 @@
*/
void affirmOrder(Integer orderId,Integer memberId);
+ void orderWriteOff(String exchangeCode,Integer memberId);
+
+ /**
+ * 璁㈠崟鍒犻櫎
+ * @param orderId
+ * @param memberId
+ */
+ void delOrder(Integer orderId,Integer memberId);
/**
* 璁㈠崟璇︽儏
@@ -202,4 +220,19 @@
void resetOrderCodes();
void refreshOrderCodes();
+
+ HomeInfoResponse getHomeInfo(int memberId);
+
+ OrderPayConfirmResponse orderPayConfirm(OrderPayConfirmRequest request,
+ MemberCouponServiceImpl memberCouponService);
+
+ /**
+ * 缁忛攢鍟嗚鍗曞垪琛�
+ * @param pageWrap
+ * @return
+ */
+ PageData<Goodsorder> shopOrderPage(PageWrap<ShopOrderRequest> pageWrap);
+
+
+
}
--
Gitblit v1.9.3