From a016ab9f97b76c3b4905b890662d344d47f24005 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 28 六月 2023 18:25:14 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 64 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 8 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 6f7a3ca..dbb0fb8 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,10 +5,7 @@
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.MgtActivityAgeDto;
-import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
-import com.ruoyi.system.api.domain.dto.MgtBaseShopDto;
+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;
@@ -90,6 +87,15 @@
* @return
*/
MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto);
+
+ /**
+ * @description 确认核销优惠券
+ * @author jqs
+ * @date 2023/6/28 11:26
+ * @param merVerifyCouponDto
+ * @return MerVerifyCouponVo
+ */
+ MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto);
/**
* 收银未结清订单列表
@@ -191,7 +197,7 @@
MgtBulletinBoardVo boardOrderTotal();
/**
- * @description getTotalOrderTotal
+ * @description 获取商户订单统计
* @param mgtBaseShopDto
* @return MgtTotalOrderTotalVo
* @author jqs34
@@ -201,7 +207,7 @@
/**
- * @description
+ * @description 获取商户活动统计
* @author jqs
* @date 2023/6/20 9:28
* @param mgtBaseShopDto
@@ -210,7 +216,7 @@
MgtTotalActivityTotalVo getTotalActivityTotal(MgtBaseShopDto mgtBaseShopDto);
/**
- * @description
+ * @description 获取商户活动年龄分布
* @author jqs
* @date 2023/6/20 9:57
* @param mgtActivityAgeDto
@@ -219,7 +225,7 @@
MgtTotalActivityTotalVo getTotalActivityAgeRank(MgtActivityAgeDto mgtActivityAgeDto);
/**
- * @description
+ * @description 获取商户数据统计
* @author jqs
* @date 2023/6/20 15:50
* @param mgtBaseShopDto
@@ -236,6 +242,48 @@
*/
List<MgtMapTotalVo> 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);
}
--
Gitblit v1.7.1