出账检核-剩余出账比例

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

@@ -163,6 +163,9 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
                     updateFortune.setId(item.getId());
                     updateFortune.setFortuneAccountBizId(fortuneAccountBizId);
                     updateFortune.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
+                    // 处理金额字段
+                    updateFortune.setCurrentPaymentHkdAmount(item.getHkdAmount());
+                    updateFortune.setCurrentPaymentRatio(BigDecimal.valueOf(100));
                     updateFortuneList.add(updateFortune);
                 }
             }

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

 package com.yd.csf.service.vo;
 
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yd.csf.service.enums.CurrencyEnum;
 import com.yd.csf.service.model.Fortune;
@@ -328,13 +329,11 @@ public class FortuneVO implements Serializable {
         }
         FortuneVO fortuneVO = new FortuneVO();
         BeanUtils.copyProperties(fortune, fortuneVO);
-        // 待出账比例
-        if (fortuneVO.getCurrentPaymentRatio() != null) {
-            fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100).subtract(fortuneVO.getCurrentPaymentRatio()));
-        } else {
-            fortuneVO.setCurrentPaymentRatio(BigDecimal.ZERO);
-            fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100));
-        }
+        // 计算待出账比例
+        BigDecimal currentPaymentRatio = ObjectUtil.defaultIfNull(fortuneVO.getCurrentPaymentRatio(), BigDecimal.ZERO);
+        fortuneVO.setCurrentPaymentRatio(currentPaymentRatio);
+        fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100).subtract(currentPaymentRatio));
+
         fortuneVO.setFortunePaidAmount(fortune.getCurrentPaymentHkdAmount());
         fortuneVO.setFortuneUnpaidAmount(NumberUtil.sub(fortune.getHkdAmount(), fortune.getCurrentPaymentHkdAmount()));