From d9e75c8c09738b31c375e3b843a3f2d4927f325f Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 26 七月 2023 09:13:29 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 129 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 129 insertions(+), 0 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 18d8088..b6dc237 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
@@ -10,6 +10,7 @@
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 java.math.BigDecimal;
import java.util.List;
@@ -34,11 +35,30 @@
AppSureOrderVo buyGoods(AppSureOrderDto appSureOrderDto);
/**
+ * @description 抢购商品
+ * @author jqs
+ * @date 2023/7/6 11:45
+ * @param appPanicBuyDto
+ * @return AppSureOrderVo
+ */
+ AppPanicBuyVo panicBuyGoods(AppPanicBuyDto appPanicBuyDto);
+
+
+ /**
* 创建订单
* @param appPlaceOrderDto
* @return
*/
AppPlaceOrderVo placeOrder(AppPlaceOrderDto appPlaceOrderDto);
+
+ /**
+ * @description 创建活动订单
+ * @author jqs
+ * @date 2023/7/6 17:59
+ * @param appPlaceActivityDto
+ * @return AppPlaceOrderVo
+ */
+ AppPlaceOrderVo placeActivityOrder( AppPlaceActivityDto appPlaceActivityDto);
/**
* 分页获取用户订单
@@ -97,6 +117,15 @@
* @return MerVerifyCouponVo
*/
MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto);
+
+ /**
+ * @description 确认核销奖品
+ * @author jqs
+ * @date 2023/7/9 9:54
+ * @param merVerifyPrizeDto
+ * @return MerVerifyAwardVo
+ */
+ MerVerifyAwardVo sureVerifyPrize(MerVerifyPrizeDto merVerifyPrizeDto);
/**
* 收银未结清订单列表
@@ -289,6 +318,16 @@
MerVerifyCouponVo verifyCoupon(String verifyCode,Long shopId);
/**
+ * @description 获取核销奖品
+ * @author jqs
+ * @date 2023/7/8 17:46
+ * @param verifyCode
+ * @param shopId
+ * @return MerVerifyAwardVo
+ */
+ MerVerifyAwardVo verifyPrize(String verifyCode,Long shopId);
+
+ /**
* @description 获取用户未支付金额
* @author jqs
* @date 2023/6/29 18:00
@@ -360,4 +399,94 @@
* @return List<MgtShopAllOrderPageVo>
*/
List<MgtShopAllOrderPageVo> pageMgtShopAllOrder(Page page, MgtShopAllOrderPageDto mgtShopAllOrderPageDto);
+
+ /**
+ * @description 自动取消订单
+ * @author jqs
+ * @date 2023/7/13 17:15
+ * @param orderId
+ * @return void
+ */
+ void autoCancelOrder(String orderId);
+
+ /**
+ * @description 订单支付回调
+ * @author jqs
+ * @date 2023/7/13 17:57
+ * @param Transaction transaction
+ * @return void
+ */
+ void payBack(Transaction transaction);
+
+ /**
+ * 取消订单
+ * @param orderId
+ */
+ void refundOrder(String orderId);
+
+ /**
+ * @description 员工端活动订单统计
+ * @author jqs
+ * @date 2023/7/17 15:25
+ * @param staffTotalDto
+ * @return StaffActivityOrderTotalVo
+ */
+ StaffActivityOrderTotalVo getStaffActivityOrderTotal(StaffTotalDto staffTotalDto);
+
+
+ /**
+ * @description 员工端活动统计
+ * @author jqs
+ * @date 2023/7/17 15:51
+ * @param staffTotalDto
+ * @return StaffActivityTotalVo
+ */
+ StaffActivityTotalVo getStaffActivityTotal(StaffTotalDto staffTotalDto);
+
+ /**
+ * @description 员工端活动统计订单分布
+ * @author jqs
+ * @date 2023/7/17 16:16
+ * @param staffTotalDto
+ * @return MerOrderDistributionTotalVo
+ */
+ MerOrderDistributionTotalVo getStaffOrderDistributionTotal(StaffTotalDto staffTotalDto);
+
+
+ /**
+ * @description 员工端活动统计销售占比
+ * @author jqs
+ * @date 2023/7/17 17:03
+ * @param staffTotalDto
+ * @return MerOrderTypeTotalVo
+ */
+ MerOrderTypeTotalVo getStaffOrderTypeTotal(StaffTotalDto staffTotalDto);
+
+ /**
+ * @description 员工端获客人数
+ * @author jqs
+ * @date 2023/7/17 18:42
+ * @param staffTotalDto
+ * @return StaffActivityDateMemberTotalVo
+ */
+ StaffActivityDateMemberTotalVo getStaffActivityGetMemberTotal(StaffTotalDto staffTotalDto);
+
+ /**
+ * @description 员工端获客人数
+ * @author jqs
+ * @date 2023/7/17 18:42
+ * @param staffTotalDto
+ * @return StaffActivityDateMemberTotalVo
+ */
+ StaffActivityDateMemberTotalVo getStaffActivityMemberTotal(StaffTotalDto staffTotalDto);
+
+
+ /**
+ * @description 检查订单状态定时任务
+ * @author jqs
+ * @date 2023/7/25 14:40
+ * @param
+ * @return void
+ */
+ void checkOrderStatus();
}
--
Gitblit v1.7.1