From 1af77abfa06a1a0d537bb120ae0c362aae9d3b83 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 30 七月 2025 10:14:40 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 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 72813cc..a84425e 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 员工端活动订单统计
@@ -645,4 +664,22 @@
* @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, String goodsName, Integer goodsNum, String giftId, Integer status);
}
--
Gitblit v1.7.1