From d10302001c4a6776a190cf97a403dab3816ed4f9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 04 七月 2023 21:59:30 +0800
Subject: [PATCH] 用户端活动商品
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
index 8aedab4..bc8be49 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
@@ -80,7 +80,7 @@
* @param orderId
* @return
*/
- MerVerifyOrderVo verifyOrder(String orderId);
+ MerVerifyOrderVo verifyOrder(String orderId,Long shopId);
/**
* 确认核销订单
@@ -286,7 +286,7 @@
* @param verifyCode
* @return MerVerifyCouponVo
*/
- MerVerifyCouponVo verifyCoupon(String verifyCode);
+ MerVerifyCouponVo verifyCoupon(String verifyCode,Long shopId);
/**
* @description 获取用户未支付金额
@@ -341,4 +341,13 @@
* @return MerOrderFromRankVo
*/
MerOrderFromRankVo getMerOrderFromRank(MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户端订单管理统计
+ * @author jqs
+ * @date 2023/7/4 16:27
+ * @param merBaseDto
+ * @return MerTotalOrderVo
+ */
+ MerTotalOrderVo totalMerOrder(MerBaseDto merBaseDto);
}
--
Gitblit v1.7.1