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

额度限制去除，计费后额度允许为负

Browse Source
This commit is contained in:
luojiaquan
2026-09-18 18:14:41 +08:00
parent 9a26ba373a
commit f529067ae3
5 changed files with 69 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsExchangeRate.java
+10 -9
View File
@@ -22,14 +22,15 @@ public class BmsExchangeRate extends BaseEntity
/** 系统本位币 */
public static final String BASE_CURRENCY = "CNY";
/** 汇率类型：即期汇率 */
/** 汇率类型：即期汇率（当前系统仅启用即期汇率） */
public static final String RATE_TYPE_SPOT = "0";
/** 汇率类型：月初汇率 */
public static final String RATE_TYPE_MONTH_BEGIN = "1";
/** 汇率类型：月末汇率 */
public static final String RATE_TYPE_MONTH_END = "2";
/** 汇率类型：固定汇率 */
public static final String RATE_TYPE_FIXED = "3";
// 月初/月末/固定汇率暂不启用，先只做即期，后续需要时再恢复：
// /** 汇率类型：月初汇率 */
// public static final String RATE_TYPE_MONTH_BEGIN = "1";
// /** 汇率类型：月末汇率 */
// public static final String RATE_TYPE_MONTH_END = "2";
// /** 汇率类型：固定汇率 */
// public static final String RATE_TYPE_FIXED = "3";
/** 汇率ID */
private Long rateId;
@@ -42,8 +43,8 @@ public class BmsExchangeRate extends BaseEntity
@Excel(name = "目标币种")
private String toCurrency;
/** 汇率类型（0即期 1月初 2月末 3固定） */
@Excel(name = "汇率类型", readConverterExp = "0=即期汇率,1=月初汇率,2=月末汇率,3=固定汇率")
/** 汇率类型（当前仅 0即期；月初/月末/固定暂不启用） */
@Excel(name = "汇率类型", readConverterExp = "0=即期汇率")
private String rateType;
/** 汇率值（1源币种=?目标币种） */
bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsExchangeRateServiceImpl.java
+11 -8
View File
@@ -31,6 +31,8 @@ public class BmsExchangeRateServiceImpl implements IBmsExchangeRateService
@Override
public List<BmsExchangeRate> selectExchangeRateList(BmsExchangeRate exchangeRate)
{
// 当前仅启用即期汇率：列表/导出只展示即期配置
exchangeRate.setRateType(BmsExchangeRate.RATE_TYPE_SPOT);
return exchangeRateMapper.selectExchangeRateList(exchangeRate);
}
@@ -77,7 +79,9 @@ public class BmsExchangeRateServiceImpl implements IBmsExchangeRateService
{
String from = normalizeCurrency(fromCurrency);
String to = normalizeCurrency(toCurrency);
String type = StringUtils.isNotEmpty(rateType) ? rateType : BmsExchangeRate.RATE_TYPE_SPOT;
// 当前系统只启用即期汇率：忽略外部传入的 rateType，统一按即期处理。
// 后续启用月初/月末/固定汇率时，恢复为：StringUtils.isNotEmpty(rateType) ? rateType : RATE_TYPE_SPOT
String type = BmsExchangeRate.RATE_TYPE_SPOT;
Date date = truncateToDay(bizDate != null ? bizDate : DateUtils.getNowDate());
// 同币种
@@ -212,10 +216,8 @@ public class BmsExchangeRateServiceImpl implements IBmsExchangeRateService
{
rate.setFromCurrency(normalizeCurrency(rate.getFromCurrency()));
rate.setToCurrency(normalizeCurrency(rate.getToCurrency()));
if (StringUtils.isEmpty(rate.getRateType()))
{
rate.setRateType(BmsExchangeRate.RATE_TYPE_SPOT);
}
// 当前仅启用即期汇率，新增/编辑统一落即期（月初/月末/固定暂不启用）
rate.setRateType(BmsExchangeRate.RATE_TYPE_SPOT);
if (StringUtils.isEmpty(rate.getSource()))
{
rate.setSource("手工录入");
@@ -273,9 +275,10 @@ public class BmsExchangeRateServiceImpl implements IBmsExchangeRateService
{
switch (type)
{
case BmsExchangeRate.RATE_TYPE_MONTH_BEGIN: return "月初汇率";
case BmsExchangeRate.RATE_TYPE_MONTH_END: return "月末汇率";
case BmsExchangeRate.RATE_TYPE_FIXED: return "固定汇率";
// 月初/月末/固定汇率暂不启用，先只做即期：
// case BmsExchangeRate.RATE_TYPE_MONTH_BEGIN: return "月初汇率";
// case BmsExchangeRate.RATE_TYPE_MONTH_END: return "月末汇率";
// case BmsExchangeRate.RATE_TYPE_FIXED: return "固定汇率";
case BmsExchangeRate.RATE_TYPE_SPOT:
default: return "即期汇率";
}