From c4b2a916399eee796bbf93d24bf41fd18c4d9f44 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 09:10:11 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 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 b60da44..72edbc3 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
@@ -12,6 +12,7 @@
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.poji.goods.Goods;
import com.ruoyi.system.api.domain.vo.*;
import java.math.BigDecimal;
@@ -123,6 +124,17 @@
*/
MerVerifyOrderVo verifyOrderDouYin(String orderId, Long shopId);
+
+ /**
+ * 获取快手的核销订单
+ *
+ * @param orderId
+ * @param shopId
+ * @return
+ */
+ MerVerifyOrderVo verifyOrderKuaiShou(String orderId, Long shopId);
+
+
/**
* 确认核销订单
*
@@ -137,6 +149,13 @@
* @return
*/
MerVerifyOrderVo sureVerifyOrderDouYin(MerVerifyOrderDto merVerifyOrderDto);
+
+ /**
+ * 核销快手券
+ *
+ * @return
+ */
+ MerVerifyOrderVo sureVerifyOrderKuaiShou(MerVerifyOrderDto merVerifyOrderDto);
/**
@@ -443,7 +462,7 @@
* @param orderId
* @return void
*/
- void autoCancelOrder(String orderId);
+ void autoCancelOrder(String orderId, Integer cancelType);
/**
* @description 订单支付回调
@@ -458,7 +477,7 @@
* 取消订单
* @param orderId
*/
- void refundOrder(String orderId);
+ void refundOrder(String orderId, Integer cancelType);
/**
* @description 员工端活动订单统计
@@ -630,4 +649,37 @@
* @return
*/
R refundOrderBySys(CancelOrderDTO dto);
+
+ /**
+ * 三方订单
+ * @param page
+ * @param dto
+ * @return
+ */
+ List<MgtThirdOrderPageVo> pageMgtThirdOrder(Page<MgtThirdOrderPageVo> page, MgtThirdOrderPageDto dto);
+
+ /**
+ * 三方订单统计
+ * @param mgtBasePlatformDto
+ * @return
+ */
+ MgtPlTotalThirdOrderStaticsVO getPlTotalThirdOrderStatics(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * 获取商品售卖统计
+ * @param goodsIdList
+ * @return
+ */
+ StaticsShopMgtGoodsVO getGoodsSellStatic(List<String> goodsIdList);
+
+
+ /**
+ * 手动添加订单
+ * @param shopId
+ * @param userId
+ * @param goods
+ * @param goodsNum
+ * @param giftId
+ */
+ void addOrder(Long shopId, Long userId, Goods goods, Integer goodsNum, String giftId, Integer status);
}
--
Gitblit v1.7.1