push

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

@@ -304,17 +304,19 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         } else {
         } else {
             vo.setRealRate(BigDecimal.ZERO);
             vo.setRealRate(BigDecimal.ZERO);
             vo.setGapRate(BigDecimal.ZERO);
             vo.setGapRate(BigDecimal.ZERO);
-            // 当产品来佣率为零或 null 时，总入账比例无意义，设置为 0
-            vo.setTotalRevenueRatio(BigDecimal.ZERO);
+            if ("U".equals(expected.getCommissionBizType())) {
+                //应收款类型 R=关联保单应收单 totalRevenueRatio取值paidRatio
+                vo.setTotalRevenueRatio(paidRatio);
+            }else {
+                vo.setTotalRevenueRatio(BigDecimal.ZERO);
+            }
         }
         }
 
 
         // 待入账金额
         // 待入账金额
         // 待入账金额归零 = 已入账来佣比例（实佣率）>= 产品来佣率
         // 待入账金额归零 = 已入账来佣比例（实佣率）>= 产品来佣率
         if (commissionRatio != null && paidRatio.compareTo(commissionRatio) >= 0) {
         if (commissionRatio != null && paidRatio.compareTo(commissionRatio) >= 0) {
             vo.setPendingAmount(BigDecimal.ZERO);
             vo.setPendingAmount(BigDecimal.ZERO);
-//            vo.setPendingRatio(BigDecimal.ZERO);
         } else if (commissionRatio != null) {
         } else if (commissionRatio != null) {
-//            vo.setPendingRatio(commissionRatio.subtract(paidRatio));
             if (expected.getExpectedAmount() != null) {
             if (expected.getExpectedAmount() != null) {
                 //待入账金额 = 预计来佣金额 - 已入账来佣金额
                 //待入账金额 = 预计来佣金额 - 已入账来佣金额
                 vo.setPendingAmount(expected.getExpectedAmount().subtract(paidAmount));
                 vo.setPendingAmount(expected.getExpectedAmount().subtract(paidAmount));
@@ -350,7 +352,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                         commission.getReconciliationYearMonth().replace("-", "") : "");
                         commission.getReconciliationYearMonth().replace("-", "") : "");
 //        vo.setRealCommissionDate(commission.getCommissionDate());
 //        vo.setRealCommissionDate(commission.getCommissionDate());
         vo.setRealExchangeRate(commission.getExchangeRate());
         vo.setRealExchangeRate(commission.getExchangeRate());
-        vo.setRealAmount(commission.getAmount());
+        vo.setRealAmount(commission.getHkdAmount());
         vo.setRealCurrentCommissionRatio(commission.getCurrentCommissionRatio());
         vo.setRealCurrentCommissionRatio(commission.getCurrentCommissionRatio());
         vo.setRealUpdateTime(commission.getUpdateTime());
         vo.setRealUpdateTime(commission.getUpdateTime());
         vo.setRealUpdaterName(commission.getUpdaterName());
         vo.setRealUpdaterName(commission.getUpdaterName());
@@ -402,7 +404,11 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                     : gap.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
                     : gap.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
             vo.setGapRate(gapRate);
             vo.setGapRate(gapRate);
         } else {
         } else {
-            vo.setRevenueRatio(BigDecimal.ZERO);
+            if ("U".equals(commission.getCommissionBizType())) {
+                vo.setRevenueRatio(new BigDecimal("100.00"));
+            }else {
+                vo.setRevenueRatio(BigDecimal.ZERO);
+            }
             vo.setGapRate(BigDecimal.ZERO);
             vo.setGapRate(BigDecimal.ZERO);
         }
         }