新增应付18

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

@@ -1275,18 +1275,12 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         BeanUtils.copyProperties(request, updateExpectedFortune);
         BeanUtils.copyProperties(request, updateExpectedFortune);
         updateExpectedFortune.setId(expectedFortune.getId());
         updateExpectedFortune.setId(expectedFortune.getId());
 
 
-        // 币种或金额变更，则需要重新计算港币金额和待出账金额
-        if (ObjectUtils.notEqual(expectedFortune.getCurrency(), request.getCurrency()) || ObjectUtils.notEqual(expectedFortune.getHkdAmount(), request.getAmount())) {
-            // 默认结算汇率
-            updateExpectedFortune.setDefaultExchangeRate(
-                    queryExchangeRateByFeign(
-                            updateExpectedFortune.getCurrency(),
-                            "HKD"
-                    ));
+        // 如果金额变更，则需要重新计算港币金额和待出账金额
+        if (ObjectUtils.notEqual(expectedFortune.getHkdAmount(), request.getHkdAmount())) {
             // 计算港币金额
             // 计算港币金额
-            updateExpectedFortune.setHkdAmount(updateExpectedFortune.getAmount().multiply(updateExpectedFortune.getDefaultExchangeRate()));
+            updateExpectedFortune.setHkdAmount(request.getHkdAmount());
             // 更新待出账金额
             // 更新待出账金额
-            updateExpectedFortune.setUnpaidAmount(updateExpectedFortune.getHkdAmount());
+            updateExpectedFortune.setUnpaidAmount(request.getHkdAmount());
         }
         }
         // 获取当前登录用户
         // 获取当前登录用户
         AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
         AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();

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

@@ -36,10 +36,10 @@ public class ExpectedFortuneUpdateRequest {
     private LocalDate actualPayoutDate;
     private LocalDate actualPayoutDate;
 
 
     /**
     /**
-     * 出账金额
+     * 港币出账金额
      */
      */
-    @Schema(description = "出账金额")
-    private BigDecimal amount;
+    @Schema(description = "港币出账金额")
+    private BigDecimal hkdAmount;
 
 
     /**
     /**
      * 出账状态
      * 出账状态