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:
wuweihua
2026-09-18 17:09:48 +08:00
parent bb240746a6 e722c6feb1
commit f0855c7dd4
9 changed files with 221 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerReceipt.java
+13
View File
@@ -35,6 +35,13 @@ public class CustomerReceipt extends BaseEntity
/** 收款类型：混合 */
public static final String TYPE_MIXED = "MIXED";
/** 汇率来源：系统默认（本币CNY 1:1） */
public static final String RATE_SOURCE_SYSTEM = "SYSTEM";
/** 汇率来源：汇率表（收款日即期汇率自动带出） */
public static final String RATE_SOURCE_RATE_TABLE = "RATE_TABLE";
/** 汇率来源：手工修改/手工录入 */
public static final String RATE_SOURCE_MANUAL = "MANUAL";
/** 主键 */
private Long id;
@@ -65,6 +72,12 @@ public class CustomerReceipt extends BaseEntity
/** 对CNY汇率（1原币=?CNY，CNY为1；默认取汇率表，可手工修改） */
private BigDecimal exchangeRate;
/** 汇率来源：SYSTEM系统默认(本币1:1)/RATE_TABLE汇率表/MANUAL手工修改 */
private String rateSource;
/** 汇率来源说明（汇率表来源及命中路径，或手工录入说明） */
private String rateSourceDesc;
/** 本位币金额（CNY，原币金额×汇率） */
private BigDecimal baseAmount;
bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java
+78 -5
View File
@@ -130,25 +130,65 @@ public class CustomerMoneyServiceImpl implements ICustomerMoneyService
{
receipt.setCurrency(receipt.getCurrency().trim().toUpperCase());
}
// 汇率与本位币金额：CNY 固定 1:1；外币默认取汇率表即期汇率，也允许页面手工修改后传入
// 汇率与本位币金额：CNY 固定 1:1；外币以收款日即期汇率表为基准，允许页面手工修改。
// 汇率来源由后端权威判定（不信任前端标记）：与汇率表一致=RATE_TABLE，不一致/表未配置=MANUAL。
BigDecimal rate = receipt.getExchangeRate();
if (BASE_CURRENCY.equals(receipt.getCurrency()))
{
rate = BigDecimal.ONE;
receipt.setRateSource(CustomerReceipt.RATE_SOURCE_SYSTEM);
receipt.setRateSourceDesc("系统默认（本位币1:1）");
}
else
{
Date bizDate = receipt.getReceivedAt() != null ? receipt.getReceivedAt() : new Date();
BmsExchangeRate tableRate = null;
try
{
tableRate = exchangeRateService.resolveRate(
receipt.getCurrency(), BASE_CURRENCY, BmsExchangeRate.RATE_TYPE_SPOT, bizDate);
}
catch (ServiceException ex)
{
// 汇率表未配置：若页面手工录了有效汇率则放行，否则继续走下面的非空校验拦截
tableRate = null;
}
if (rate == null || rate.compareTo(BigDecimal.ZERO) <= 0)
{
Date bizDate = receipt.getReceivedAt() != null ? receipt.getReceivedAt() : new Date();
BmsExchangeRate rateConfig = exchangeRateService.resolveRate(
receipt.getCurrency(), BASE_CURRENCY, BmsExchangeRate.RATE_TYPE_SPOT, bizDate);
rate = rateConfig.getExchangeRate();
if (tableRate == null)
{
throw new ServiceException("汇率表未维护【" + receipt.getCurrency()
+ " → CNY】收款日生效的即期汇率，请手工录入汇率");
}
rate = tableRate.getExchangeRate();
}
if (rate.compareTo(BigDecimal.ZERO) <= 0)
{
throw new ServiceException("汇率必须大于0，请检查录入的汇率");
}
rate = rate.setScale(8, RoundingMode.HALF_UP);
// 与汇率表汇率一致（8位精度）即认定为汇率表来源，否则为手工修改
if (tableRate != null
&& rate.compareTo(tableRate.getExchangeRate().setScale(8, RoundingMode.HALF_UP)) == 0)
{
receipt.setRateSource(CustomerReceipt.RATE_SOURCE_RATE_TABLE);
receipt.setRateSourceDesc(buildRateTableSourceDesc(tableRate));
}
else
{
receipt.setRateSource(CustomerReceipt.RATE_SOURCE_MANUAL);
if (tableRate != null)
{
receipt.setRateSourceDesc("手工修改（汇率表即期汇率 "
+ tableRate.getExchangeRate().setScale(8, RoundingMode.HALF_UP).toPlainString() + "）");
}
else
{
receipt.setRateSourceDesc("手工录入（汇率表未维护该币种收款日汇率）");
}
}
}
receipt.setExchangeRate(rate.setScale(8, RoundingMode.HALF_UP));
BigDecimal baseAmount = receipt.getAmount().multiply(rate).setScale(MONEY_SCALE, RoundingMode.HALF_UP);
@@ -171,6 +211,39 @@ public class CustomerMoneyServiceImpl implements ICustomerMoneyService
return 1;
}
/**
* 构造汇率表来源说明：汇率来源（中国银行/央行等）+ 命中路径（正向/反向取倒数/经CNY交叉）。
* resolveRate 返回对象的 remark 带 __RATE_PATH__ 前缀标记命中路径。
*/
private String buildRateTableSourceDesc(BmsExchangeRate tableRate)
{
String source = StringUtils.hasText(tableRate.getSource()) ? tableRate.getSource() : "汇率表";
String path = "DIRECT";
String remark = tableRate.getRemark();
if (StringUtils.hasText(remark) && remark.startsWith("__RATE_PATH__"))
{
path = remark.substring("__RATE_PATH__".length());
}
String pathText;
switch (path)
{
case "REVERSE":
pathText = "反向配置取倒数";
break;
case "CROSS":
pathText = "经CNY交叉换算";
break;
case "SAME":
pathText = "同币种";
break;
case "DIRECT":
default:
pathText = "正向配置";
break;
}
return "汇率表·" + source + "（" + pathText + "）";
}
@Override
@Transactional(rollbackFor = Exception.class)
public int confirmReceipt(Long id)
bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsExchangeRateServiceImpl.java
+13 -1
View File
@@ -78,7 +78,7 @@ public class BmsExchangeRateServiceImpl implements IBmsExchangeRateService
String from = normalizeCurrency(fromCurrency);
String to = normalizeCurrency(toCurrency);
String type = StringUtils.isNotEmpty(rateType) ? rateType : BmsExchangeRate.RATE_TYPE_SPOT;
Date date = bizDate != null ? bizDate : DateUtils.getNowDate();
Date date = truncateToDay(bizDate != null ? bizDate : DateUtils.getNowDate());
// 同币种
if (from.equals(to))
@@ -147,6 +147,18 @@ public class BmsExchangeRateServiceImpl implements IBmsExchangeRateService
/* ============================ 私有方法 ============================ */
/**
* 截断到日历日 00:00:00。
* 汇率表 effective_date/expire_date 为 date 类型（精确到天），业务时间（如收款时间带时分秒）
* 直接参与比较时，"失效日当天"会因 expire_date 被提升为当天 00:00:00 而提前失效，
* 故所有业务日统一按日历日落入 [生效日, 失效日] 闭区间。
*/
private Date truncateToDay(Date date)
{
return Date.from(date.toInstant().atZone(java.time.ZoneId.systemDefault())
.toLocalDate().atStartOfDay(java.time.ZoneId.systemDefault()).toInstant());
}
/**
* 查找单跳汇率（先正向，再反向取倒数），查不到返回 null
*/
bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml
+8 -1
View File
@@ -233,6 +233,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="unallocatedAmount" column="unallocated_amount" />
<result property="currency" column="currency" />
<result property="exchangeRate" column="exchange_rate" />
<result property="rateSource" column="rate_source" />
<result property="rateSourceDesc" column="rate_source_desc" />
<result property="baseAmount" column="base_amount" />
<result property="payMethod" column="pay_method" />
<result property="bankTransactionNo" column="bank_transaction_no" />
@@ -253,7 +255,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectCustomerReceiptVo">
select r.id, r.receipt_no, r.customer_id, r.account_id, r.receipt_type, r.amount, r.allocated_amount,
r.unallocated_amount, r.currency, r.exchange_rate, r.base_amount, r.pay_method, r.bank_transaction_no,
r.unallocated_amount, r.currency, r.exchange_rate, r.rate_source, r.rate_source_desc,
r.base_amount, r.pay_method, r.bank_transaction_no,
r.received_at, r.status,
r.confirmed_at, r.confirmed_by, r.invoice_status, r.version, r.create_by, r.create_time,
r.update_by, r.update_time, r.remark, r.del_flag,
@@ -305,6 +308,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="unallocatedAmount != null">unallocated_amount,</if>
<if test="currency != null">currency,</if>
<if test="exchangeRate != null">exchange_rate,</if>
<if test="rateSource != null">rate_source,</if>
<if test="rateSourceDesc != null">rate_source_desc,</if>
<if test="baseAmount != null">base_amount,</if>
<if test="payMethod != null">pay_method,</if>
<if test="bankTransactionNo != null">bank_transaction_no,</if>
@@ -328,6 +333,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="unallocatedAmount != null">#{unallocatedAmount},</if>
<if test="currency != null">#{currency},</if>
<if test="exchangeRate != null">#{exchangeRate},</if>
<if test="rateSource != null">#{rateSource},</if>
<if test="rateSourceDesc != null">#{rateSourceDesc},</if>
<if test="baseAmount != null">#{baseAmount},</if>
<if test="payMethod != null">#{payMethod},</if>
<if test="bankTransactionNo != null">#{bankTransactionNo},</if>
bms-back/sql/customer+supplier/customer_receipt_rate_source.sql
+15
View File
@@ -0,0 +1,15 @@
-- ----------------------------
-- 客户收款单增加汇率来源留痕：
-- rate_source 汇率来源类型（SYSTEM系统默认本币1:1 / RATE_TABLE汇率表自动带出 / MANUAL手工修改）
-- rate_source_desc 来源说明（汇率表来源+命中路径，或手工录入说明）
-- 登记收款时由后端权威判定：CNY=SYSTEM；外币汇率与收款日即期汇率表一致=RATE_TABLE，否则=MANUAL。
-- ----------------------------
ALTER TABLE `customer_receipt`
ADD COLUMN `rate_source` VARCHAR(16) NOT NULL DEFAULT 'SYSTEM'
COMMENT '汇率来源：RATE_TABLE汇率表/MANUAL手工修改/SYSTEM系统默认(本币1:1)' AFTER `exchange_rate`,
ADD COLUMN `rate_source_desc` VARCHAR(100) DEFAULT NULL
COMMENT '汇率来源说明（汇率表来源及命中路径/手工录入等）' AFTER `rate_source`;
-- 存量数据订正：本币收款=系统默认；历史外币收款按汇率表取值口径登记，统一标记为汇率表
UPDATE `customer_receipt` SET `rate_source` = 'SYSTEM' WHERE `currency` = 'CNY' AND `rate_source` = 'SYSTEM';
UPDATE `customer_receipt` SET `rate_source` = 'RATE_TABLE' WHERE `currency` <> 'CNY';
bms-back/sql/customer+supplier/客户管理相关所有表结构.sql
View File