diff --git "a/sql/v2.2\350\264\242\345\212\241/20250222-currency-rate.sql" "b/sql/v2.2\350\264\242\345\212\241/20250222-currency-rate.sql" index ee9ef001150300b16ae00a54489623e757c4b2a8..3f841c4a32996f76467d8c606429e1b7e2f8948d 100644 --- "a/sql/v2.2\350\264\242\345\212\241/20250222-currency-rate.sql" +++ "b/sql/v2.2\350\264\242\345\212\241/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 diff --git a/yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/dataobject/commissionPayable/CommissionPayableDO.java b/yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/dataobject/commissionPayable/CommissionPayableDO.java index 61890ecc3774594904242fa47e847476c8e33742..ea8f1195fc6530144e96fe58d90d4e4553c63ef2 100644 --- a/yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/dataobject/commissionPayable/CommissionPayableDO.java +++ b/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; /** * 请款å•ä¿®æ”¹æ—¶åº”付是å¦è¢«å‰”除 diff --git a/yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/commissionPayment/CommissionPaymentServiceImpl.java b/yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/commissionPayment/CommissionPaymentServiceImpl.java index 31e5cf172097c6ad9949d2a37ba91985bab9f815..c9828174e48d4ca78095b2108eeb0c7d530ec078 100644 --- a/yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/commissionPayment/CommissionPaymentServiceImpl.java +++ b/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); } diff --git a/yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/commissionPayable/CommissionPayableBaseVO.java b/yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/commissionPayable/CommissionPayableBaseVO.java index c478ca1e04c41f616713bd70f52909b82f920431..90667b2b765ac6a10729541539a057fadbb953ca 100644 --- a/yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/commissionPayable/CommissionPayableBaseVO.java +++ b/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 å–消 */