From b83a7d0a9249e74ee337cc5ef2a97d1a100e08fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 七月 2025 20:11:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java |   18 ++++++++++++++++++
 1 files changed, 18 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 b5971b3..e3382a0 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
@@ -123,6 +123,17 @@
      */
     MerVerifyOrderVo verifyOrderDouYin(String orderId, Long shopId);
     
+    
+    /**
+     * 获取快手的核销订单
+     *
+     * @param orderId
+     * @param shopId
+     * @return
+     */
+    MerVerifyOrderVo verifyOrderKuaiShou(String orderId, Long shopId);
+    
+    
     /**
      * 确认核销订单
      *
@@ -138,6 +149,13 @@
      */
     MerVerifyOrderVo sureVerifyOrderDouYin(MerVerifyOrderDto merVerifyOrderDto);
     
+    /**
+     * 核销快手券
+     *
+     * @return
+     */
+    MerVerifyOrderVo sureVerifyOrderKuaiShou(MerVerifyOrderDto merVerifyOrderDto);
+    
     
     /**
      * @param merVerifyCouponDto

--
Gitblit v1.7.1