付款业务汇率计算修改

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

@@ -89,3 +89,10 @@ ALTER TABLE `ecw_commission_payable` ADD COLUMN `source_currency_code` varchar(2
 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 '汇率';
+
+
+ALTER TABLE `ecw_payable` ADD COLUMN `source_amount` DECIMAL(14, 4) DEFAULT NULL COMMENT '原币种基准金额' AFTER `exchange_rate`;
+ALTER TABLE `ecw_payable` ADD COLUMN `source_currency_code` varchar(255) DEFAULT NULL COMMENT '原币种代码' AFTER `source_amount`;
+ALTER TABLE `ecw_payable` ADD COLUMN `target_amount` DECIMAL(14, 4) DEFAULT NULL COMMENT '支付币种基准金额' AFTER `source_currency_code`;
+ALTER TABLE `ecw_payable` ADD COLUMN `target_currency_code` varchar(255) DEFAULT NULL COMMENT '支付币种代码' AFTER `target_amount`;
+ALTER TABLE `ecw_payable` modify COLUMN `exchange_rate` varchar(64)  DEFAULT '1:1' COMMENT '汇率';

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/dataobject/payable/PayableDO.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -138,4 +139,21 @@ public class PayableDO extends BaseDO {
      */
     private Date freecsdate;
 
+    /**
+     * 原币种基准金额
+     */
+    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/payment/PaymentServiceImpl.java

@@ -131,6 +131,10 @@ public class PaymentServiceImpl extends AbstractService<PaymentMapper, PaymentDO
             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);
             payableService.updateById(payableDO);
 
@@ -195,6 +199,10 @@ public class PaymentServiceImpl extends AbstractService<PaymentMapper, PaymentDO
             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);
             payableService.updateById(payableDO);
         }

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/payable/PayableBackVO.java

@@ -15,6 +15,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.Date;
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -163,6 +164,22 @@ public class PayableBackVO {
     @ApiModelProperty(value = "空运出货状态")
     private Integer shipmentStatusAir;
 
+    /**
+     * 原币种基准金额
+     */
+    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/vo/payable/PayableBaseVO.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.wealth.vo.payable;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 import io.swagger.annotations.*;
@@ -105,4 +106,21 @@ public class PayableBaseVO {
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private Date freecsdate;
 
+    /**
+     * 原币种基准金额
+     */
+    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/vo/payable/PayableReqVO.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 @ApiModel("管理后台 - 应付单明细 Request VO")
 @Data
@@ -31,5 +32,22 @@ public class PayableReqVO extends PayableBaseVO {
     @NotNull(message = "发票号不能为空")
     private String invoiceNumber;
 
+    /**
+     * 原币种基准金额
+     */
+    private BigDecimal sourceAmount;
+    /**
+     * 原币种代码
+     */
+    private String sourceCurrencyCode;
+    /**
+     * 支付币种基准金额
+     */
+    private BigDecimal targetAmount;
+    /**
+     * 支付币种代码
+     */
+    private String targetCurrencyCode;
+
 
 }