Merge remote-tracking branch 'origin/test' into test

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

@@ -380,7 +380,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "未找到该来佣记录");
         }
         Policy policy = null;
-        if (StringUtils.isNotBlank(commission.getPolicyNo())) {
+        if (StringUtils.isNotBlank(commissionUpdateRequest.getPolicyNo())) {
             policy = policyService.lambdaQuery().eq(Policy::getPolicyNo, commission.getPolicyNo()).one();
             if (policy == null) {
                 throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "保单不存在:" + commission.getPolicyNo());

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

@@ -165,9 +165,11 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
                     updateFortune.setFortuneAccountBizId(fortuneAccountBizId);
                     updateFortune.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
                     // 处理金额字段
+                    if (BigDecimal.ZERO.compareTo(item.getHkdAmount()) != 0) {
                         updateFortune.setCurrentPaymentHkdAmount(item.getCurrentPaymentHkdAmount());
                         updateFortune.setCurrentPaymentRatio(item.getCurrentPaymentHkdAmount()
                                 .divide(item.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
+                    }
                     updateFortune.setReconciliationOperator(currentLoginUser.getUsername());
                     updateFortuneList.add(updateFortune);
                 }