From f615ec5c9239327740948501627545f8e78e2a9e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 18 三月 2025 09:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/BalanceChangeRecordClient.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/BalanceChangeRecordClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/BalanceChangeRecordClient.java
index c8ccb4f..db8eee2 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/BalanceChangeRecordClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/BalanceChangeRecordClient.java
@@ -11,6 +11,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
+
/**
* @author zhibing.pu
* @Date 2024/12/2 15:34
@@ -26,10 +28,28 @@
*/
@PostMapping("/balanceChangeRecord/saveBalanceChangeRecord")
R saveBalanceChangeRecord(@RequestBody BalanceChangeRecord balanceChangeRecord);
-
+
+ /**
+ * 保存分佣临时流水数据
+ * @param balanceChangeRecord
+ * @return
+ */
@PostMapping("/balanceChangeRecordCopy/saveBalanceChangeRecordCopy")
- R saveBalanceChangeRecord(@RequestBody BalanceChangeRecordCopy balanceChangeRecord);
-
- @DeleteMapping("/balanceChangeRecordCopy/deleteBalanceChangeRecord")
- R deleteBalanceChangeRecord(@RequestParam("orderId") Long orderId);
+ R saveBalanceChangeRecordCopy(@RequestBody BalanceChangeRecordCopy balanceChangeRecord);
+
+ /**
+ * 删除分佣临时数据
+ * @param orderId
+ * @return
+ */
+ @DeleteMapping("/balanceChangeRecordCopy/deleteBalanceChangeRecordCopy")
+ R deleteBalanceChangeRecordCopy(@RequestParam("orderId") Long orderId, @RequestParam("changeType") List<Integer> changeType);
+
+ /**
+ * 查询分佣临时流水数据
+ * @param orderId
+ * @return
+ */
+ @PostMapping("/balanceChangeRecordCopy/getBalanceChangeRecordCopy")
+ R<List<BalanceChangeRecordCopy>> getBalanceChangeRecordCopy(@RequestParam("orderId") Long orderId, @RequestParam("changeType") List<Integer> changeType);
}
--
Gitblit v1.7.1