出账检核-剩余出账比例

9497c4e6 · jianan · 110119f3 · 9497c4e6 · 9497c4e6
Commit 9497c4e6 authored Mar 13, 2026 by jianan
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

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

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

No files found.
--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java
+++ b/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);
                }
            }

--- a/yd-csf-service/src/main/java/com/yd/csf/service/vo/FortuneVO.java
+++ b/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) {
+        BigDecimal currentPaymentRatio = ObjectUtil.defaultIfNull(fortuneVO.getCurrentPaymentRatio(), BigDecimal.ZERO);
-            fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100).subtract(fortuneVO.getCurrentPaymentRatio()));
+        fortuneVO.setCurrentPaymentRatio(currentPaymentRatio);
-        } else {
+        fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100).subtract(currentPaymentRatio));
-            fortuneVO.setCurrentPaymentRatio(BigDecimal.ZERO);
-            fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100));
-        }
        fortuneVO.setFortunePaidAmount(fortune.getCurrentPaymentHkdAmount());
        fortuneVO.setFortuneUnpaidAmount(NumberUtil.sub(fortune.getHkdAmount(), fortune.getCurrentPaymentHkdAmount()));