新汇率获取货币代码冗余值bug修复

yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/service/api/CurrecyApiImpl.java

@@ -46,13 +46,20 @@ public class CurrecyApiImpl implements CurrencyApi {
             dto.setTargetCurrencyAmount(BigDecimal.ZERO);
         } else {
             if (sourceId.equals(targetId)){
+                String code = Optional.ofNullable(currencyService.getCurrency(Math.toIntExact(sourceId)))
+                        .map(CurrencyDO::getFuhao)
+                        .orElse(null);
                 dto.setSourceCurrencyAmount(BigDecimal.ONE);
+                dto.setSourceCurrencyCode(code);
                 dto.setTargetCurrencyAmount(BigDecimal.ONE);
+                dto.setTargetCurrencyCode(code);
                 dto.setCurrencyRate(BigDecimal.ONE);
             }else {
                 CurrencyRateDO currencyRateDO = currencyRateService.exchangeBaseValue(sourceId, targetId);
                 dto.setSourceCurrencyAmount(currencyRateDO.getSourceAmount());
+                dto.setSourceCurrencyCode(currencyRateDO.getSourceCurrencyCode());
                 dto.setTargetCurrencyAmount(currencyRateDO.getTargetAmount());
+                dto.setTargetCurrencyCode(currencyRateDO.getTargetCurrencyCode());
                 dto.setCurrencyRate(currencyRateService.rate(currencyRateDO.getSourceAmount(), currencyRateDO.getTargetAmount()));
             }
 
@@ -76,8 +83,13 @@ public class CurrecyApiImpl implements CurrencyApi {
         dto.setTargetCurrencyCode(targetCode);
 
         if (StrUtil.equals(sourceCode, targetCode)) {
+            String code = Optional.ofNullable(currencyService.getCurrencyByCode(sourceCode))
+                    .map(CurrencyDO::getFuhao)
+                    .orElse(null);
             dto.setSourceCurrencyAmount(BigDecimal.ONE);
+            dto.setSourceCurrencyCode(code);
             dto.setTargetCurrencyAmount(BigDecimal.ONE);
+            dto.setTargetCurrencyCode(code);
             dto.setCurrencyRate(BigDecimal.ONE);
             return dto;
         }
@@ -101,7 +113,9 @@ public class CurrecyApiImpl implements CurrencyApi {
             }else {
                 CurrencyRateDO currencyRateDO = currencyRateService.exchangeBaseValue(sourceId, targetId);
                 dto.setSourceCurrencyAmount(currencyRateDO.getSourceAmount());
+                dto.setSourceCurrencyCode(currencyRateDO.getSourceCurrencyCode());
                 dto.setTargetCurrencyAmount(currencyRateDO.getTargetAmount());
+                dto.setTargetCurrencyCode(currencyRateDO.getTargetCurrencyCode());
                 dto.setCurrencyRate(currencyRateService.rate(currencyRateDO.getSourceAmount(), currencyRateDO.getTargetAmount()));
             }
 

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receiptItem/ReceiptItemBackVO.java

 package cn.iocoder.yudao.module.wealth.vo.receiptItem;
 
 import cn.iocoder.yudao.module.wealth.vo.receivable.ReceivableInItemVO;
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -79,6 +81,22 @@ public class ReceiptItemBackVO {
     @ApiModelProperty(value = "收款汇率")
     private String rate;
 
+    @ApiModelProperty(value = "原币种基础汇率金额")
+    @ExcelIgnore
+    private BigDecimal sourceAmount;
+
+    @ApiModelProperty(value = "原币种代码")
+    @ExcelIgnore
+    private String sourceCurrencyCode;
+
+    @ApiModelProperty(value = "支付币种基础汇率金额")
+    @ExcelIgnore
+    private BigDecimal targetAmount;
+
+    @ApiModelProperty(value = "支付币种代码")
+    @ExcelIgnore
+    private String targetCurrencyCode;
+
     @ExcelProperty("实收日期")
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     @ApiModelProperty(value = "实收日期")

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receiptItem/ReceiptItemRespVO.java

@@ -2,11 +2,13 @@ package cn.iocoder.yudao.module.wealth.vo.receiptItem;
 
 import cn.iocoder.yudao.framework.common.util.io.FileModel;
 import cn.iocoder.yudao.module.wealth.vo.receipt.ReceiptRelationOrderInfoVO;
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -48,6 +50,18 @@ public class ReceiptItemRespVO {
     @ApiModelProperty(value = "收款汇率")
     private String rate;
 
+    @ApiModelProperty(value = "原币种基础汇率金额")
+    private BigDecimal sourceAmount;
+
+    @ApiModelProperty(value = "原币种代码")
+    private String sourceCurrencyCode;
+
+    @ApiModelProperty(value = "支付币种基础汇率金额")
+    private BigDecimal targetAmount;
+
+    @ApiModelProperty(value = "支付币种代码")
+    private String targetCurrencyCode;
+
     @ApiModelProperty(value = "实收日期")
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private Date amountDate;