From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 04 六月 2023 13:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 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 226ce20..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,16 +1,15 @@
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.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.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;
@@ -88,4 +87,55 @@
* @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