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 | 87 +++++++++++++++++++++++++++++++++++++------
1 files changed, 75 insertions(+), 12 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 36c35cc..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
@@ -5,15 +5,12 @@
import com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsResult;
import com.github.binarywang.wxpay.bean.ecommerce.RefundNotifyResult;
import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingNotifyResult;
+import com.ruoyi.order.domain.dto.MerVerifyPrizeDto;
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.*;
-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 com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction;
+import com.ruoyi.system.api.domain.vo.*;
import java.math.BigDecimal;
import java.util.List;
@@ -83,6 +80,15 @@
* @param orderId
*/
void cancelOrder(String orderId);
+
+ /**
+ * @description 支付订单
+ * @author jqs
+ * @date 2023/8/27 15:26
+ * @param orderId
+ * @return AppPlaceOrderVo
+ */
+ AppPlaceOrderVo payOrder(String orderId);
/**
* 获取用户订单统计
@@ -156,7 +162,7 @@
* @param merOrderPageDto
* @return
*/
- List<MerOrderPageVo> pageMerOrder(Page page,MerOrderPageDto merOrderPageDto);
+ List<MerOrderPageVo> pageMerOrder(Page page, MerOrderPageDto merOrderPageDto);
/**
* 分页商户端用户收银记录
@@ -164,7 +170,7 @@
* @param merMemberNoClearOrderDto
* @return
*/
- List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
+ List<MerMemberOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
/**
* 获取用户订单统计
@@ -248,6 +254,8 @@
*/
MgtTotalActivityTotalVo getTotalActivityTotal(MgtBaseShopDto mgtBaseShopDto);
+ MgtTotalActivityTotalVo getTotalActivityJoinMemberTotal(MgtBaseShopDto mgtBaseShopDto);
+
/**
* @description 获取商户活动年龄分布
* @author jqs
@@ -255,7 +263,7 @@
* @param mgtActivityAgeDto
* @return MgtTotalActivityTotalVo
*/
- MgtTotalActivityTotalVo getTotalActivityAgeRank(MgtActivityAgeDto mgtActivityAgeDto);
+ //MgtTotalActivityTotalVo getTotalActivityAgeRank(MgtActivityAgeDto mgtActivityAgeDto);
/**
* @description 获取商户数据统计
@@ -302,6 +310,10 @@
*/
MgtPlTotalActivityTotalVo getPlTotalActivityTotal(MgtBasePlatformDto mgtBasePlatformDto);
+ MgtPlTotalActivityTotalVo getPlTotalActivityJoinMemberTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ MgtPlTotalActivityTotalVo getPlTotalActivityGetMemberTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
/**
* @description 获取商户活动年龄分布
* @author jqs
@@ -309,7 +321,7 @@
* @param mgtPLActivityAgeDto
* @return MgtTotalActivityTotalVo
*/
- MgtPlTotalActivityTotalVo getPlTotalActivityAgeRank(MgtPlActivityAgeDto mgtPLActivityAgeDto);
+ //MgtPlTotalActivityTotalVo getPlTotalActivityAgeRank(MgtPlActivityAgeDto mgtPLActivityAgeDto);
/**
* @description 获取优惠券核销信息
@@ -388,7 +400,7 @@
* @description 商户端订单管理统计
* @author jqs
* @date 2023/7/4 16:27
- * @param merBaseDto
+ * @param merOrderPageDto
* @return MerTotalOrderVo
*/
MerTotalOrderVo totalMerOrder(MerOrderPageDto merOrderPageDto);
@@ -416,7 +428,7 @@
* @description 订单支付回调
* @author jqs
* @date 2023/7/13 17:57
- * @param Transaction transaction
+ * @param transaction
* @return void
*/
void payBack(PartnerTransactionsResult transaction);
@@ -483,7 +495,6 @@
*/
StaffActivityDateMemberTotalVo getStaffActivityMemberTotal(StaffTotalDto staffTotalDto);
-
/**
* @description 检查订单状态定时任务
* @author jqs
@@ -521,4 +532,56 @@
* @return
*/
List<MerOrderPageVo> pageMerMemberPayOrder(Page page,MerMemberNoClearOrderDto merOrderPageDto);
+
+
+
+ /**
+ * @description 获取销售排行
+ * @author jqs
+ * @date 2023/8/24 18:00
+ * @param shopIdList
+ * @return List<MgtMapIntTotalVo>
+ */
+ List<MgtMapBigTotalVo> shopSalesRank(List<Long> shopIdList);
+
+ /**
+ * @description 获取商户服务统计
+ * @author jqs
+ * @date 2023/8/24 18:28
+ * @param shopId
+ * @return MerHomeShopTotalVo
+ */
+ MerHomeShopTotalVo getShopServiceTotal(Long shopId);
+
+ /**
+ * @description 获取区域统计
+ * @author jqs
+ * @date 2023/8/25 11:49
+ * @param shopIdList
+ * @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