From 0f9d03ee930d1c2dc62b34dd2c3522cda91f93cf Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 06 六月 2023 14:29:33 +0800
Subject: [PATCH] 基础配置

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java |   84 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 77 insertions(+), 7 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..f219244 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,15 @@
 package com.ruoyi.order.service.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.order.domain.dto.*;
+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.dto.MerPageDto;
 import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -68,4 +66,76 @@
      * @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);
+
+    /**
+     * 收银未结清订单列表
+     * @param page
+     * @param merMemberNoClearOrderDto
+     * @return
+     */
+    List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
+
+
+    /**
+     * 结清订单
+     * @param merCloseOrderDto
+     */
+    void merCloseOrder(MerCloseOrderDto merCloseOrderDto);
+
+    /**
+     * 创建新订单
+     * @param merNewOrderDto
+     */
+    void createNewOrder(MerNewOrderDto merNewOrderDto);
+
+    /**
+     * 分页获取商户订单
+     * @param merOrderPageDto
+     * @return
+     */
+    List<MerOrderPageVo> pageMerOrder(Page page,MerOrderPageDto merOrderPageDto);
+
+    /**
+     * 分页商户端用户收银记录
+     * @param page
+     * @param merMemberNoClearOrderDto
+     * @return
+     */
+    List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
+
+    /**
+     * 获取用户订单统计
+     * @param mgtMemberOrderTotalDto
+     * @return
+     */
+    MgtMemberOrderTotalVo getMgtMemberOrderTotal(MgtMemberOrderTotalDto mgtMemberOrderTotalDto);
+
+    /**
+     * 分页获取用户订单列表
+     * @param page
+     * @param mgtMemberOrderPageDto
+     * @return
+     */
+    List<MgtMemberOrderPageVo> pageMgtMemberOrder(Page page, MgtMemberOrderPageDto mgtMemberOrderPageDto);
 }

--
Gitblit v1.7.1