wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS

Browse Source
This commit is contained in:
luojiaquan
2026-09-17 17:27:42 +08:00
parent 41ddcc525a 5dcea947a7
commit 8b49959ac3
8 changed files with 203 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/impl/CustomerAccountApiImpl.java
+12 -8
View File
@@ -247,8 +247,8 @@ public class CustomerAccountApiImpl implements ICustomerAccountApi
validateUsageCommand(command);
Long customerId = resolveCustomerId(command);
String currency = resolveCurrency(command.getCurrency());
String username = SecurityUtils.getUsername();
Long userId = SecurityUtils.getUserId();
String username = currentUsername();
Long userId = currentUserId();
CustomerAccount account = lockAccountForUsage(customerId, currency, username);
if (account == null)
{
@@ -282,8 +282,8 @@ public class CustomerAccountApiImpl implements ICustomerAccountApi
validateUsageCommand(command);
Long customerId = resolveCustomerId(command);
String currency = resolveCurrency(command.getCurrency());
String username = SecurityUtils.getUsername();
Long userId = SecurityUtils.getUserId();
String username = currentUsername();
Long userId = currentUserId();
CustomerAccount account = lockAccountForUsage(customerId, currency, username);
if (account == null)
{
@@ -720,19 +720,23 @@ public class CustomerAccountApiImpl implements ICustomerAccountApi
private String bizTypeLabel(String bizType)
{
if (CustomerFundBizType.RECEIPT.equals(bizType))
{
return "\u6536\u6b3e";
}
if (CustomerFundBizType.AR_BILL.equals(bizType))
{
return "应收账单";
return "\u5e94\u6536\u8d26\u5355";
}
if (CustomerFundBizType.ORDER.equals(bizType))
{
return "计费订单";
return "\u8ba1\u8d39\u8ba2\u5355";
}
if (CustomerFundBizType.BILL_PAY.equals(bizType))
{
return "账单核销";
return "\u8d26\u5355\u6838\u9500";
}
return "业务";
return "\u4e1a\u52a1";
}
/** 临时额度是否已过期：有失效日期且今天已晚于失效日（失效日当天仍有效） */