出账检核

yd-csf-service/src/main/java/com/yd/csf/service/vo/FortuneVO.java

@@ -330,13 +330,15 @@ public class FortuneVO implements Serializable {
         FortuneVO fortuneVO = new FortuneVO();
         BeanUtils.copyProperties(fortune, fortuneVO);
         // 计算已出账金额和待出账金额
-        fortuneVO.setFortunePaidAmount(fortune.getCurrentPaymentHkdAmount());
-        fortuneVO.setFortuneUnpaidAmount(NumberUtil.sub(fortune.getHkdAmount(), fortune.getCurrentPaymentHkdAmount()));
-        // 计算待出账比例
+        BigDecimal currentPaymentHkdAmount = "2".equals(fortune.getStatus()) ? fortune.getCurrentPaymentHkdAmount() : BigDecimal.ZERO;
+        fortuneVO.setFortunePaidAmount(currentPaymentHkdAmount);
+        fortuneVO.setFortuneUnpaidAmount(NumberUtil.sub(fortune.getHkdAmount(), currentPaymentHkdAmount));
+        // 计算已出账比例
         BigDecimal currentPaymentRatio = NumberUtil
-                .div(fortune.getCurrentPaymentHkdAmount(), fortune.getHkdAmount(), 4)
+                .div(currentPaymentHkdAmount, fortune.getHkdAmount(), 4)
                 .multiply(BigDecimal.valueOf(100));
         fortuneVO.setCurrentPaymentRatio(currentPaymentRatio);
+        // 计算剩余出账比例
         fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100).subtract(currentPaymentRatio));
 
         fortuneVO.setCurrency(CurrencyEnum.toLabel(fortune.getCurrency()));