From 2cfceadff437135a255990ab9698788a48adb636 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 16 十二月 2025 09:54:00 +0800
Subject: [PATCH] 小程序 用户端接口开发

---
 server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 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 767a985..5426d39 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,14 +4,21 @@
 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.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.goods.DealOrderRequest;
 import com.doumee.dao.web.request.goods.MemberOrderRequest;
 import com.doumee.dao.web.request.goods.OrderCommentRequest;
+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.PayResponse;
+import com.doumee.service.business.impl.MemberCouponServiceImpl;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -60,7 +67,7 @@
     void orderSendOutGoods(Goodsorder goodsorder);
 
     void orderRemark(Goodsorder goodsorder);
-
+    IPage<Shop> getShopPage(PageWrap<Shop> pageWrap);
     void coffeePlanCancelOrder(Goodsorder goodsorder);
     void orderPlanCancelOrder(Goodsorder goodsorder);
 
@@ -120,7 +127,7 @@
      * @param orderPayRequest
      * @return
      */
-    PayResponse orderPay(OrderPayRequest orderPayRequest);
+    PayResponse orderPay(ShopOrderPayRequest orderPayRequest, MemberCouponServiceImpl memberCouponService);
 
     /**
      * 閲嶆柊鏀粯
@@ -144,13 +151,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);
 
     /**
      * 鍌彂璐�
@@ -167,6 +181,14 @@
      */
     void affirmOrder(Integer orderId,Integer memberId);
 
+    void orderWriteOff(String exchangeCode,Integer memberId);
+
+    /**
+     * 璁㈠崟鍒犻櫎
+     * @param orderId
+     * @param memberId
+     */
+    void delOrder(Integer orderId,Integer memberId);
 
     /**
      * 璁㈠崟璇︽儏
@@ -190,6 +212,7 @@
     MyPageResponse ordersStatistics(Integer memberId);
 
 
+
     /**
      * 璁㈠崟鑷姩纭
      */
@@ -198,4 +221,6 @@
     void resetOrderCodes();
 
     void refreshOrderCodes();
+
+    HomeInfoResponse getHomeInfo(int memberId);
 }

--
Gitblit v1.9.3