From 546be8a1bafdfc804575a8d07a5d9f2306c29c42 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 11:20:58 +0800
Subject: [PATCH] 修改直播列表

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 a187676..55c01d7 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
@@ -235,7 +235,7 @@
     * @author jqs34
     * @date 2023/6/18 17:20
     */
-    MgtBulletinBoardVo boardOrderTotal();
+    MgtBulletinBoardVo boardOrderTotal(List<Long> userIds);
 
     /**
     * @description 获取商户订单统计
@@ -433,7 +433,7 @@
      * @param  transaction
      * @return  void
      */
-    void payBack(PartnerTransactionsResult transaction);
+    void payBack(PartnerTransactionsResult transaction, BigDecimal feeAmount);
 
     /**
      * 取消订单
@@ -588,5 +588,13 @@
     MerMemberSimpleTotalVo getMerMemberSimpleTotalVo(MerBaseDto merBaseDto);
 
 
-    ProfitSharingResult queryBill(String transactionId,String outOrderNo) throws WxPayException;
+    ProfitSharingResult queryBill(String orderId) throws WxPayException;
+
+
+    /**
+     * 根据活动id获取订单商品id列表
+     * @param activityId
+     * @return
+     */
+    List<String> getActivityOrderGoods(String activityId);
 }

--
Gitblit v1.7.1