Merge branch 'refs/heads/test_zjn' into test

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

@@ -952,10 +952,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
             expectedFortune.setFortuneName(queryByDict(expectedFortuneDto.getFortuneType()));
             // 应付款编号（序号递增）
             expectedFortune.setPayableNo(this.createPayableNo(expectedFortune.getFortuneBizType(), ++currentSeq));
-            // 计算金额
-            expectedFortune.setAmount(
-                    NumberUtil.div(expectedFortuneDto.getHkdAmount(), expectedFortuneDto.getDefaultExchangeRate(), 2)
-            );
+
 
             // 已出帐金额、待出帐金额、已出帐比例、待出帐比例
             expectedFortune.setPaidAmount(BigDecimal.ZERO);
@@ -1018,7 +1015,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
             if (Objects.isNull(expectedFortuneDto.getCurrency())) {
                 throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "预计出账币种不能为空");
             }
-            if (Objects.isNull(expectedFortuneDto.getDefaultExchangeRate())) {
+            if (Objects.isNull(expectedFortuneDto.getExchangeRate())) {
                 throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "结算汇率不能为空");
             }
         }

yd-csf-feign/src/main/java/com/yd/csf/feign/request/expectedfortune/ExpectedFortuneAddRequest.java

@@ -79,7 +79,7 @@ public class ExpectedFortuneAddRequest {
      * 结算汇率
      */
     @Schema(description = "结算汇率")
-    private BigDecimal defaultExchangeRate;
+    private BigDecimal exchangeRate;
 
     /**
      * 出账金额 单位：港币