From 0ca3a3922d2d25df52682b2290be15135cce100e Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 29 九月 2026 17:56:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GroupCompanyClient.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GroupCompanyClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GroupCompanyClient.java
index edac8a7..685c2be 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GroupCompanyClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GroupCompanyClient.java
@@ -54,11 +54,16 @@
/**
* 结算公司金额（解锁锁定额并按实际消费扣减，允许扣成负数；返回扣减后余额）
+ * <p>订单号非空时按订单号幂等（账户侧消费流水作为幂等键），补偿重试不会重复结算</p>
*/
@PostMapping("/group-company/remote/settle-balance")
R<BigDecimal> settleBalance(@RequestParam("companyId") Integer companyId,
@RequestParam("lockedAmount") BigDecimal lockedAmount,
- @RequestParam("actualAmount") BigDecimal actualAmount);
+ @RequestParam("actualAmount") BigDecimal actualAmount,
+ @RequestParam(value = "orderCode", required = false) String orderCode,
+ @RequestParam(value = "userInfo", required = false) String userInfo,
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "remark", required = false) String remark);
/**
* 释放公司锁定金额（未产生消费时使用，返回释放后余额）
--
Gitblit v1.7.1