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 | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 5 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 fd0480c..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
@@ -9,8 +9,9 @@
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
-import com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -79,7 +80,7 @@
* @param orderId
* @return
*/
- MerVerifyOrderVo verifyOrder(String orderId);
+ MerVerifyOrderVo verifyOrder(String orderId,Long shopId);
/**
* 确认核销订单
@@ -87,6 +88,15 @@
* @return
*/
MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto);
+
+ /**
+ * @description 确认核销优惠券
+ * @author jqs
+ * @date 2023/6/28 11:26
+ * @param merVerifyCouponDto
+ * @return MerVerifyCouponVo
+ */
+ MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto);
/**
* 收银未结清订单列表
@@ -229,9 +239,9 @@
* @author jqs
* @date 2023/6/21 15:27
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
*/
- List<MgtMapTotalVo> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapIntTotalVo> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description 获取平台商户数据统计
@@ -276,5 +286,68 @@
* @param verifyCode
* @return MerVerifyCouponVo
*/
- MerVerifyCouponVo verifyCoupon(String verifyCode);
+ MerVerifyCouponVo verifyCoupon(String verifyCode,Long shopId);
+
+ /**
+ * @description 获取用户未支付金额
+ * @author jqs
+ * @date 2023/6/29 18:00
+ * @param merBaseDto
+ * @return BigDecimal
+ */
+ BigDecimal getMemberUnpaidOrder(MerBaseDto merBaseDto);
+
+ /**
+ * @description 商户端获取订单统计
+ * @author jqs
+ * @date 2023/7/3 19:29
+ * @param merTotalDto
+ * @return MerOrderTotalVo
+ */
+ MerOrderTotalVo getMerOrderTotal(MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户端获取订单分布统计
+ * @author jqs
+ * @date 2023/7/4 9:29
+ * @param merTotalDto
+ * @return MerOrderDistributionTotalVo
+ */
+ MerOrderDistributionTotalVo MerOrderDistributionTotalVo(MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户端获取销售占比统计
+ * @author jqs
+ * @date 2023/7/4 13:58
+ * @param merTotalDto
+ * @return MerOrderTypeTotalVo
+ */
+ MerOrderTypeTotalVo getMerOrderTypeTotal(MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户端获取销售排行
+ * @author jqs
+ * @date 2023/7/4 14:23
+ * @param merTotalDto
+ * @return MerOrderGoodsRankVo
+ */
+ MerOrderGoodsRankVo getMerOrderGoodsRank(MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户端获取渠道排行
+ * @author jqs
+ * @date 2023/7/4 14:51
+ * @param merTotalDto
+ * @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