Commit 56341372 authored by 332784038@qq.com's avatar 332784038@qq.com

收款账户明细

parent 28c328db
...@@ -102,3 +102,15 @@ ALTER TABLE `ecw_payable` ADD COLUMN `source_currency_code` varchar(255) DEFAULT ...@@ -102,3 +102,15 @@ ALTER TABLE `ecw_payable` ADD COLUMN `source_currency_code` varchar(255) DEFAULT
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_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` 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 '汇率'; ALTER TABLE `ecw_payable` modify COLUMN `exchange_rate` varchar(64) DEFAULT '1:1' COMMENT '汇率';
ALTER TABLE `ecw_receipt_account` ADD COLUMN `source_amount` DECIMAL(14, 4) DEFAULT NULL COMMENT '原币种基准金额' AFTER `write_off_rate`;
ALTER TABLE `ecw_receipt_account` ADD COLUMN `source_currency_code` varchar(255) DEFAULT NULL COMMENT '原币种代码' AFTER `source_amount`;
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`;
update `ecw_receipt_account` r left join `ecw_currency_rate` r1 on r.currency_id = r1.source_id and r.collection_currency_id = r1.target_id
set r.source_amount = r1.source_amount, r.`source_currency_code` = r1.target_currency_code, r.target_amount = r1.target_amount, r.`target_currency_code` = r1.target_currency_code;
update `ecw_receipt_account` r 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 where r.currency_id = r.collection_currency_id;
...@@ -84,4 +84,20 @@ public class ReceiptAccountDO extends BaseDO { ...@@ -84,4 +84,20 @@ public class ReceiptAccountDO extends BaseDO {
*/ */
private BigDecimal collectionAmount; private BigDecimal collectionAmount;
/**
* 原币种基准金额
*/
private BigDecimal sourceAmount;
/**
* 原币种代码
*/
private String sourceCurrencyCode;
/**
* 支付币种基准金额
*/
private BigDecimal targetAmount;
/**
* 支付币种代码
*/
private String targetCurrencyCode;
} }
...@@ -68,4 +68,21 @@ public class ReceiptAccountBackVO { ...@@ -68,4 +68,21 @@ public class ReceiptAccountBackVO {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
/**
* 原币种基准金额
*/
private BigDecimal sourceAmount;
/**
* 原币种代码
*/
private String sourceCurrencyCode;
/**
* 支付币种基准金额
*/
private BigDecimal targetAmount;
/**
* 支付币种代码
*/
private String targetCurrencyCode;
} }
...@@ -44,6 +44,21 @@ public class ReceiptAccountBaseVO { ...@@ -44,6 +44,21 @@ public class ReceiptAccountBaseVO {
@ApiModelProperty(value = "收款金额") @ApiModelProperty(value = "收款金额")
private BigDecimal collectionAmount; private BigDecimal collectionAmount;
/**
* 原币种基准金额
*/
private BigDecimal sourceAmount;
/**
* 原币种代码
*/
private String sourceCurrencyCode;
/**
* 支付币种基准金额
*/
private BigDecimal targetAmount;
/**
* 支付币种代码
*/
private String targetCurrencyCode;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment