新增出账选择港币不需要乘汇率、点击完成检核，状态改为可出账，检核完成

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneServiceImpl.java

@@ -358,8 +358,8 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             // 校验发佣记录状态
             StringBuilder validateMsg = new StringBuilder();
             for (Fortune fortune : fortuneList) {
-                if (!StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.CHECKED.getItemValue())) {
-                    validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("当前状态不是'可出账, 已检核'，不能生成出账记录; ");
+                if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.WAIT.getItemValue())) {
+                    validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("待出账状态不能直接改为'可出账, 检核完成'，不能生成出账记录; ");
                 }
                 if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.SENT.getItemValue())) {
                     validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("已完成出账，不能生成出账记录; ");
@@ -723,6 +723,10 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
 
             Fortune fortune = new Fortune();
             BeanUtil.copyProperties(fortuneAddRequest, fortune);
+            // 计算港币金额
+            fortune.setExchangeRate(queryExchangeRateByFeign(fortuneAddRequest.getCurrency(), "HKD"));
+            fortune.setHkdAmount(fortuneAddRequest.getAmount().multiply(fortune.getExchangeRate()));
+            fortune.setCurrentPaymentHkdAmount(fortune.getHkdAmount());
 
             if ("R".equals(fortuneAddRequest.getFortuneBizType())) {
                 ExpectedFortune expectedFortune = expectedFortuneMap.get(fortuneAddRequest.getPolicyNo() + "_" + fortuneAddRequest.getFortunePeriod() + "_" + fortuneAddRequest.getFortuneType());
@@ -731,9 +735,6 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                 }
                 fortune.setExpectedFortuneBizId(expectedFortune.getExpectedFortuneBizId());
                 fortune.setPolicyCurrency(expectedFortune.getPolicyCurrency());
-                fortune.setExchangeRate(expectedFortune.getDefaultExchangeRate());
-                fortune.setHkdAmount(fortuneAddRequest.getAmount().multiply(expectedFortune.getDefaultExchangeRate()));
-                fortune.setCurrentPaymentHkdAmount(fortune.getHkdAmount());
                 fortune.setCurrentPaymentRatio(BigDecimal.valueOf(100));
                 fortune.setPayoutDate(expectedFortune.getPayoutDate());
 
@@ -747,10 +748,6 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                     fortune.setStatus(FortuneStatusEnum.MATCH_FAIL.getItemValue());
                     fortune.setRemark("未找到当前预计发佣对应的来佣");
                 }
-            } else {
-                fortune.setExchangeRate(BigDecimal.ONE);
-                fortune.setHkdAmount(fortuneAddRequest.getAmount());
-                fortune.setCurrentPaymentHkdAmount(fortune.getHkdAmount());
             }
 
             // 生成发佣业务ID