From 32bd52ec49d25021b6a35d8ee5f32c70df788165 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 05 七月 2023 21:30:21 +0800
Subject: [PATCH] bug 用户端
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 177 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 0685248..18d8088 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
@@ -5,11 +5,13 @@
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.vo.*;
-import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
+import com.ruoyi.system.api.domain.dto.*;
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.MgtMapIntTotalVo;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -78,7 +80,7 @@
* @param orderId
* @return
*/
- MerVerifyOrderVo verifyOrder(String orderId);
+ MerVerifyOrderVo verifyOrder(String orderId,Long shopId);
/**
* 确认核销订单
@@ -86,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);
/**
* 收银未结清订单列表
@@ -185,4 +196,168 @@
* @date 2023/6/18 17:20
*/
MgtBulletinBoardVo boardOrderTotal();
+
+ /**
+ * @description 获取商户订单统计
+ * @param mgtBaseShopDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:23
+ */
+ MgtTotalOrderTotalVo getTotalOrderTotal(MgtBaseShopDto mgtBaseShopDto);
+
+
+ /**
+ * @description 获取商户活动统计
+ * @author jqs
+ * @date 2023/6/20 9:28
+ * @param mgtBaseShopDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtTotalActivityTotalVo getTotalActivityTotal(MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description 获取商户活动年龄分布
+ * @author jqs
+ * @date 2023/6/20 9:57
+ * @param mgtActivityAgeDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtTotalActivityTotalVo getTotalActivityAgeRank(MgtActivityAgeDto mgtActivityAgeDto);
+
+ /**
+ * @description 获取商户数据统计
+ * @author jqs
+ * @date 2023/6/20 15:50
+ * @param mgtBaseShopDto
+ * @return MgtTotalDataTotalVo
+ */
+ MgtTotalDataTotalVo getTotalDataTotal(MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/21 15:27
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapIntTotalVo>
+ */
+ List<MgtMapIntTotalVo> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 获取平台商户数据统计
+ * @param mgtBasePlatformDto
+ * @return List<MgtTotalDataTotalVo>
+ * @author jqs34
+ * @date 2023/6/23 14:01
+ */
+ List<MgtTotalDataTotalVo> getPlTotalDataTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 获取平台商户订单统计
+ * @param mgtBasePlatformDto
+ * @return MgtTotalOrderTotalVo
+ * @author jqs34
+ * @date 2023/6/19 22:23
+ */
+ MgtTotalOrderTotalVo getPlTotalOrderTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 获取商户活动统计
+ * @author jqs
+ * @date 2023/6/20 9:28
+ * @param mgtBasePlatformDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtPlTotalActivityTotalVo getPlTotalActivityTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 获取商户活动年龄分布
+ * @author jqs
+ * @date 2023/6/20 9:57
+ * @param mgtPLActivityAgeDto
+ * @return MgtTotalActivityTotalVo
+ */
+ MgtPlTotalActivityTotalVo getPlTotalActivityAgeRank(MgtPlActivityAgeDto mgtPLActivityAgeDto);
+
+ /**
+ * @description 获取优惠券核销信息
+ * @author jqs
+ * @date 2023/6/27 11:10
+ * @param verifyCode
+ * @return MerVerifyCouponVo
+ */
+ 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);
+
+ /**
+ * @description 平台获取商户订单记录
+ * @author jqs
+ * @date 2023/7/5 20:17
+ * @param page
+ * @param mgtShopAllOrderPageDto
+ * @return List<MgtShopAllOrderPageVo>
+ */
+ List<MgtShopAllOrderPageVo> pageMgtShopAllOrder(Page page, MgtShopAllOrderPageDto mgtShopAllOrderPageDto);
}
--
Gitblit v1.7.1