收款账户明细补充新的汇率业务值

sql/v2.2财务/20250222-currency-rate.sql

@@ -109,6 +109,13 @@ ALTER TABLE `ecw_receipt_account` ADD COLUMN `source_currency_code` varchar(255)
 ALTER TABLE `ecw_receipt_account` ADD COLUMN `target_amount` DECIMAL(14, 4) DEFAULT NULL COMMENT '支付币种基准金额' AFTER `source_currency_code`;
 ALTER TABLE `ecw_receipt_account` ADD COLUMN `target_currency_code` varchar(255) DEFAULT NULL COMMENT '支付币种代码' AFTER `target_amount`;
 
+
+ALTER TABLE `ecw_receipt_account` ADD COLUMN `collection_source_amount` DECIMAL(14, 4) DEFAULT NULL COMMENT '收款原币种基准金额' AFTER `write_off_rate`;
+ALTER TABLE `ecw_receipt_account` ADD COLUMN `collection_source_currency_code` varchar(255) DEFAULT NULL COMMENT '收款原币种代码' AFTER `source_amount`;
+ALTER TABLE `ecw_receipt_account` ADD COLUMN `collection_target_amount` DECIMAL(14, 4) DEFAULT NULL COMMENT '收款支付币种基准金额' AFTER `source_currency_code`;
+ALTER TABLE `ecw_receipt_account` ADD COLUMN `collection_target_currency_code` varchar(255) DEFAULT NULL COMMENT '收款支付币种代码' AFTER `target_amount`;
+
+
 UPDATE `ecw_receipt_account` r  left join (SELECT
     ra.id,
     r1.source_amount,
@@ -125,7 +132,11 @@ UPDATE `ecw_receipt_account` r  left join (SELECT
         r.source_amount = rs.source_amount,
         r.source_currency_code = rs.source_currency_code,
         r.target_amount = rs.target_amount,
-        r.target_currency_code = rs.target_currency_code;
+        r.target_currency_code = rs.target_currency_code,
+        r.collection_source_amount = rs.source_amount,
+        r.collection_source_currency_code = rs.source_currency_code,
+        r.collection_target_amount = rs.target_amount,
+        r.collection_target_currency_code = rs.target_currency_code;
 
 UPDATE `ecw_receipt_account` r left join (SELECT
     ra.id
@@ -136,7 +147,14 @@ UPDATE `ecw_receipt_account` r left join (SELECT
     ) rs
 on rs.id = r.id
     left join `ecw_currency` c1 on r.currency_id = c1.id
-    set r.source_amount = 1, r.`source_currency_code` = c1.fuhao, r.target_amount = 1, r.`target_currency_code` = c1.fuhao;
+    set r.source_amount = 1,
+        r.`source_currency_code` = c1.fuhao,
+        r.target_amount = 1,
+        r.`target_currency_code` = c1.fuhao,
+        r.collection_source_amount = 1,
+        r.collection_source_currency_code = c1.fuhao,
+        r.collection_target_amount = 1,
+        r.collection_target_currency_code = c1.fuhao;
 
 
 ALTER TABLE `ecw_receipt_item` ADD COLUMN `source_amount` DECIMAL(14, 4) DEFAULT NULL COMMENT '原币种基准金额' AFTER `rate`;

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/dataobject/receiptAccount/ReceiptAccountDO.java

@@ -100,4 +100,21 @@ public class ReceiptAccountDO extends BaseDO {
      * 支付币种代码
      */
     private String targetCurrencyCode;
+
+    /**
+     * 收款原币种基准金额
+     */
+    private BigDecimal collectionSourceAmount;
+    /**
+     * 收款原币种代码
+     */
+    private String collectionSourceCurrencyCode;
+    /**
+     * 收款支付币种基准金额
+     */
+    private BigDecimal collectionTargetAmount;
+    /**
+     * 收款支付币种代码
+     */
+    private String collectionTargetCurrencyCode;
 }

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receipt/ReceiptServiceImpl.java

@@ -328,10 +328,18 @@ public class ReceiptServiceImpl extends AbstractService<ReceiptMapper, ReceiptDO
                     receiptAccountCreateReqVO.setCurrencyId(receivableBackVO.getCurrencyId());
                     receiptAccountCreateReqVO.setReceivableAmount(receivableBackVO.getActualAmount());
                     receiptAccountCreateReqVO.setWriteOffRate(receivableBackVO.getExchangeRate());
+                    receiptAccountCreateReqVO.setSourceAmount(receivableBackVO.getSourceAmount());
+                    receiptAccountCreateReqVO.setSourceCurrencyCode(receivableBackVO.getSourceCurrencyCode());
+                    receiptAccountCreateReqVO.setTargetAmount(receivableBackVO.getTargetAmount());
+                    receiptAccountCreateReqVO.setTargetCurrencyCode(receivableBackVO.getTargetCurrencyCode());
                     receiptAccountCreateReqVO.setWriteOffAmount(receivableBackVO.getBaseAmount());
                     receiptAccountCreateReqVO.setCollectionAmount(receivableBackVO.getBaseAmount());
                     receiptAccountCreateReqVO.setCollectionCurrencyId(receivableBackVO.getBaseCurrencyId());
                     receiptAccountCreateReqVO.setCollectionRate(receivableBackVO.getExchangeRate());
+                    receiptAccountCreateReqVO.setCollectionSourceAmount(receivableBackVO.getSourceAmount());
+                    receiptAccountCreateReqVO.setCollectionSourceCurrencyCode(receivableBackVO.getSourceCurrencyCode());
+                    receiptAccountCreateReqVO.setCollectionTargetAmount(receivableBackVO.getTargetAmount());
+                    receiptAccountCreateReqVO.setCollectionTargetCurrencyCode(receivableBackVO.getTargetCurrencyCode());
                     if (receiptBatchCreateReqVO.getPlatformAccountId() != null) {
                         receiptAccountCreateReqVO.setPlatformAccountId(receiptBatchCreateReqVO.getPlatformAccountId().intValue());
                         BankAccountDTO account = bankApi.getBankAccountByAccountId(receiptBatchCreateReqVO.getPlatformAccountId());

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receiptAccount/ReceiptAccountBackVO.java

@@ -84,5 +84,21 @@ public class ReceiptAccountBackVO {
      * 支付币种代码
      */
     private String targetCurrencyCode;
+    /**
+     * 收款原币种基准金额
+     */
+    private BigDecimal collectionSourceAmount;
+    /**
+     * 收款原币种代码
+     */
+    private String collectionSourceCurrencyCode;
+    /**
+     * 收款支付币种基准金额
+     */
+    private BigDecimal collectionTargetAmount;
+    /**
+     * 收款支付币种代码
+     */
+    private String collectionTargetCurrencyCode;
 
 }

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receiptAccount/ReceiptAccountBaseVO.java

@@ -61,4 +61,20 @@ public class ReceiptAccountBaseVO {
      */
     private String targetCurrencyCode;
 
+    /**
+     * 收款原币种基准金额
+     */
+    private BigDecimal collectionSourceAmount;
+    /**
+     * 收款原币种代码
+     */
+    private String collectionSourceCurrencyCode;
+    /**
+     * 收款支付币种基准金额
+     */
+    private BigDecimal collectionTargetAmount;
+    /**
+     * 收款支付币种代码
+     */
+    private String collectionTargetCurrencyCode;
 }