From dbff53150cdc807faa56c0d1a947d24b69f372b9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 31 八月 2023 18:43:20 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 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 9be0d02..7137c52 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
@@ -82,6 +82,15 @@
void cancelOrder(String orderId);
/**
+ * @description 支付订单
+ * @author jqs
+ * @date 2023/8/27 15:26
+ * @param orderId
+ * @return AppPlaceOrderVo
+ */
+ AppPlaceOrderVo payOrder(String orderId);
+
+ /**
* 获取用户订单统计
* @param userId
* @return
@@ -245,6 +254,8 @@
*/
MgtTotalActivityTotalVo getTotalActivityTotal(MgtBaseShopDto mgtBaseShopDto);
+ MgtTotalActivityTotalVo getTotalActivityJoinMemberTotal(MgtBaseShopDto mgtBaseShopDto);
+
/**
* @description 获取商户活动年龄分布
* @author jqs
@@ -252,7 +263,7 @@
* @param mgtActivityAgeDto
* @return MgtTotalActivityTotalVo
*/
- MgtTotalActivityTotalVo getTotalActivityAgeRank(MgtActivityAgeDto mgtActivityAgeDto);
+ //MgtTotalActivityTotalVo getTotalActivityAgeRank(MgtActivityAgeDto mgtActivityAgeDto);
/**
* @description 获取商户数据统计
@@ -299,6 +310,10 @@
*/
MgtPlTotalActivityTotalVo getPlTotalActivityTotal(MgtBasePlatformDto mgtBasePlatformDto);
+ MgtPlTotalActivityTotalVo getPlTotalActivityJoinMemberTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ MgtPlTotalActivityTotalVo getPlTotalActivityGetMemberTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
/**
* @description 获取商户活动年龄分布
* @author jqs
@@ -306,7 +321,7 @@
* @param mgtPLActivityAgeDto
* @return MgtTotalActivityTotalVo
*/
- MgtPlTotalActivityTotalVo getPlTotalActivityAgeRank(MgtPlActivityAgeDto mgtPLActivityAgeDto);
+ //MgtPlTotalActivityTotalVo getPlTotalActivityAgeRank(MgtPlActivityAgeDto mgtPLActivityAgeDto);
/**
* @description 获取优惠券核销信息
@@ -480,7 +495,6 @@
*/
StaffActivityDateMemberTotalVo getStaffActivityMemberTotal(StaffTotalDto staffTotalDto);
-
/**
* @description 检查订单状态定时任务
* @author jqs
@@ -520,10 +534,6 @@
List<MerOrderPageVo> pageMerMemberPayOrder(Page page,MerMemberNoClearOrderDto merOrderPageDto);
- void createWxPayInfo(AppPlaceOrderVo appPlaceOrderVo, Long userId, Long shopId,
- String goodsName, String orderNo,
- String orderId, BigDecimal payMoney,
- String openid, String payerClientIp, List<String> goodsNameList,Integer orderFrom);
/**
* @description 获取销售排行
@@ -551,4 +561,27 @@
* @return AgencyTotalVo
*/
AgencyTotalVo getAgencyTotalVo(List<Long> shopIdList);
+
+ /**
+ * 订单编号获取订单
+ * @param orderNo
+ * @return
+ */
+ Order getByOrderNo(String orderNo);
+
+ /**
+ *
+ * @param outTradeNo
+ * @return
+ */
+ Order getByOutTradeNo(String outTradeNo);
+
+ /**
+ * @description 商户端会员订单统计
+ * @author jqs
+ * @date 2023/8/29 17:39
+ * @param merBaseDto
+ * @return MerMemberSimpleTotalVo
+ */
+ MerMemberSimpleTotalVo getMerMemberSimpleTotalVo(MerBaseDto merBaseDto);
}
--
Gitblit v1.7.1