佣金请款业务汇率计算修改

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

@@ -83,3 +83,9 @@ ALTER TABLE `ecw_receivable` ADD COLUMN `dest_country_target_currency_code` varc
 ALTER TABLE `ecw_receivable` ADD COLUMN `dest_country_sub_source_amount` DECIMAL(14, 4) DEFAULT NULL COMMENT '目的国副币种汇兑原币种基准金额' AFTER `dest_country_target_currency_code`;
 ALTER TABLE `ecw_receivable` ADD COLUMN `dest_country_sub_target_amount` DECIMAL(14, 4) DEFAULT NULL COMMENT '目的国副币种支付基准金额' AFTER `dest_country_sub_source_amount`;
 ALTER TABLE `ecw_receivable` ADD COLUMN `dest_country_sub_target_currency_code` varchar(255) DEFAULT NULL COMMENT '目的国副币种代码' AFTER `dest_country_sub_target_amount`;
+
+ALTER TABLE `ecw_commission_payable` ADD COLUMN `source_amount` DECIMAL(14, 4) DEFAULT NULL COMMENT '原币种基准金额' AFTER `exchange_rate`;
+ALTER TABLE `ecw_commission_payable` ADD COLUMN `source_currency_code` varchar(255) DEFAULT NULL COMMENT '原币种代码' AFTER `source_amount`;
+ALTER TABLE `ecw_commission_payable` ADD COLUMN `target_amount` DECIMAL(14, 4) DEFAULT NULL COMMENT '支付币种基准金额' AFTER `source_currency_code`;
+ALTER TABLE `ecw_commission_payable` ADD COLUMN `target_currency_code` varchar(255) DEFAULT NULL COMMENT '支付币种代码' AFTER `target_amount`;
+ALTER TABLE `ecw_commission_payable` modify COLUMN `exchange_rate` varchar(64)  DEFAULT '1:1' COMMENT '汇率';
\ No newline at end of file

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/dataobject/commissionPayable/CommissionPayableDO.java

@@ -146,7 +146,22 @@ public class CommissionPayableDO extends BaseDO {
      * 运输方式
      */
     private Long transportId;
-
+    /**
+     * 原币种基准金额
+     */
+    private BigDecimal sourceAmount;
+    /**
+     * 原币种代码
+     */
+    private String sourceCurrencyCode;
+    /**
+     * 支付币种基准金额
+     */
+    private BigDecimal targetAmount;
+    /**
+     * 支付币种代码
+     */
+    private String targetCurrencyCode;
 
     /**
      * 请款单修改时应付是否被剔除

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/commissionPayment/CommissionPaymentServiceImpl.java

@@ -149,6 +149,10 @@ public class CommissionPaymentServiceImpl extends AbstractService<CommissionPaym
             payableDO.setTotal(payableReqVO.getTotal());
             payableDO.setTaxRate(payableReqVO.getTaxRate());
             payableDO.setExchangeRate(payableReqVO.getExchangeRate());
+            payableDO.setSourceAmount(payableReqVO.getSourceAmount());
+            payableDO.setSourceCurrencyCode(payableReqVO.getSourceCurrencyCode());
+            payableDO.setTargetAmount(payableReqVO.getTargetAmount());
+            payableDO.setTargetCurrencyCode(payableReqVO.getTargetCurrencyCode());
             payableDO.setState(1);
             commissionPayableService.updateById(payableDO);
         }
@@ -217,6 +221,10 @@ public class CommissionPaymentServiceImpl extends AbstractService<CommissionPaym
                         payableDO.setTotal(commissionPayableReqVO.getTotal());
                         payableDO.setTaxRate(commissionPayableReqVO.getTaxRate());
                         payableDO.setExchangeRate(commissionPayableReqVO.getExchangeRate());
+                        payableDO.setSourceAmount(commissionPayableReqVO.getSourceAmount());
+                        payableDO.setSourceCurrencyCode(commissionPayableReqVO.getSourceCurrencyCode());
+                        payableDO.setTargetAmount(commissionPayableReqVO.getTargetAmount());
+                        payableDO.setTargetCurrencyCode(commissionPayableReqVO.getTargetCurrencyCode());
                         payableDO.setState(1);
                         commissionPayableService.updateById(payableDO);
                     }
@@ -238,6 +246,10 @@ public class CommissionPaymentServiceImpl extends AbstractService<CommissionPaym
                 payableDO.setTotal(commissionPayableReqVO.getTotal());
                 payableDO.setTaxRate(commissionPayableReqVO.getTaxRate());
                 payableDO.setExchangeRate(commissionPayableReqVO.getExchangeRate());
+                payableDO.setSourceAmount(commissionPayableReqVO.getSourceAmount());
+                payableDO.setSourceCurrencyCode(commissionPayableReqVO.getSourceCurrencyCode());
+                payableDO.setTargetAmount(commissionPayableReqVO.getTargetAmount());
+                payableDO.setTargetCurrencyCode(commissionPayableReqVO.getTargetCurrencyCode());
                 payableDO.setState(1);
                 commissionPayableService.updateById(payableDO);
             }

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/commissionPayable/CommissionPayableBaseVO.java

@@ -104,6 +104,23 @@ public class CommissionPayableBaseVO {
     @ApiModelProperty(value = "运输方式")
     private Long transportId;
 
+    /**
+     * 原币种基准金额
+     */
+    private BigDecimal sourceAmount;
+    /**
+     * 原币种代码
+     */
+    private String sourceCurrencyCode;
+    /**
+     * 支付币种基准金额
+     */
+    private BigDecimal targetAmount;
+    /**
+     * 支付币种代码
+     */
+    private String targetCurrencyCode;
+
     /**
      * 流程状态：1 处理中 2 通过 3 不通过 4 取消
      */