From 1bffd4079857f265e0bf05306c0b53fa1583278e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 04 五月 2023 16:16:12 +0800
Subject: [PATCH] 商户端
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 282fec9..226ce20 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
@@ -1,17 +1,16 @@
package com.ruoyi.order.service.order;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.order.domain.dto.MerVerifyOrderDto;
+import com.ruoyi.order.domain.vo.*;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.order.domain.dto.AppPlaceOrderDto;
import com.ruoyi.order.domain.dto.AppSureOrderDto;
import com.ruoyi.order.domain.dto.AppUserOrderPageDto;
import com.ruoyi.order.domain.pojo.order.Order;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.domain.vo.AppPlaceOrderVo;
-import com.ruoyi.order.domain.vo.AppSureOrderVo;
-import com.ruoyi.order.domain.vo.AppUserOrderGetVo;
-import com.ruoyi.order.domain.vo.AppUserOrderPageVo;
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import java.util.List;
@@ -68,4 +67,25 @@
* @return
*/
AppOrderTotalVo getAppOrderTotal(Long userId);
+
+ /**
+ * 获取B端首页统计
+ * @param merHomeShopTotalVo
+ * @return
+ */
+ MerHomeShopTotalVo getMerHomeTotal(MerHomeShopTotalVo merHomeShopTotalVo);
+
+ /**
+ * 获取核销订单
+ * @param orderId
+ * @return
+ */
+ MerVerifyOrderVo verifyOrder(String orderId);
+
+ /**
+ * 确认核销订单
+ * @param merVerifyOrderDto
+ * @return
+ */
+ MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto);
}
--
Gitblit v1.7.1