From 3e0236dfc2cf6fca45c5e951a2cb0c722ba60b38 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:16:03 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 be5d986..f528dc8 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
@@ -433,7 +433,7 @@
* @param transaction
* @return void
*/
- void payBack(PartnerTransactionsResult transaction);
+ void payBack(PartnerTransactionsResult transaction, BigDecimal feeAmount);
/**
* 取消订单
@@ -589,4 +589,12 @@
ProfitSharingResult queryBill(String orderId) throws WxPayException;
+
+
+ /**
+ * 根据活动id获取订单商品id列表
+ * @param activityId
+ * @return
+ */
+ List<String> getActivityOrderGoods(String activityId);
}
--
Gitblit v1.7.1