push

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java

@@ -397,7 +397,6 @@ public class ApiCommissionExpectedController {
         return Result.success(response);
         return Result.success(response);
     }
     }
 
 
-
     public IPage<ReceivableReportVO> convertReceivableReport(IPage<ReceivableReportVO> receivableReportPage) {
     public IPage<ReceivableReportVO> convertReceivableReport(IPage<ReceivableReportVO> receivableReportPage) {
         if (!org.springframework.util.CollectionUtils.isEmpty(receivableReportPage.getRecords())) {
         if (!org.springframework.util.CollectionUtils.isEmpty(receivableReportPage.getRecords())) {
             List<String> policyNoList = receivableReportPage.getRecords().stream().map(ReceivableReportVO::getPolicyNo).collect(Collectors.toList());
             List<String> policyNoList = receivableReportPage.getRecords().stream().map(ReceivableReportVO::getPolicyNo).collect(Collectors.toList());
@@ -415,12 +414,12 @@ public class ApiCommissionExpectedController {
                     vo.setProductName(policyFollow.getProductName());
                     vo.setProductName(policyFollow.getProductName());
                     vo.setProductLaunchBizId(policyFollow.getProductLaunchBizId());
                     vo.setProductLaunchBizId(policyFollow.getProductLaunchBizId());
                 }
                 }
-                //已入账比例（%）>= 预计入账比例（%） 待入账比例和待入账金额归零
-                //已入账比例（%）
-                BigDecimal paidRatio = ObjectUtils.defaultIfNull(vo.getPaidRatio(), BigDecimal.ZERO);
+                //实用率和值 >= 预计入账比例（%） 待入账比例和待入账金额归零
+                //实用率和值
+                BigDecimal paid = ObjectUtils.defaultIfNull(vo.getPaid(), BigDecimal.ZERO);
                 //预计入账比例（%）
                 //预计入账比例（%）
                 BigDecimal commissionRatio = ObjectUtils.defaultIfNull(vo.getCommissionRatio(), BigDecimal.ZERO);
                 BigDecimal commissionRatio = ObjectUtils.defaultIfNull(vo.getCommissionRatio(), BigDecimal.ZERO);
-                if (paidRatio.compareTo(commissionRatio) >= 0) {
+                if (paid.compareTo(commissionRatio) >= 0) {
                     //待入账金额（港币）
                     //待入账金额（港币）
                     vo.setUnpaidAmount(BigDecimal.ZERO);
                     vo.setUnpaidAmount(BigDecimal.ZERO);
                     //待入账比例（%）
                     //待入账比例（%）
@@ -432,7 +431,6 @@ public class ApiCommissionExpectedController {
         }
         }
         return receivableReportPage;
         return receivableReportPage;
     }
     }
-    
 
 
     private void enrichReceivableReportWithCompanyName(IPage<ReceivableReportVO> page) {
     private void enrichReceivableReportWithCompanyName(IPage<ReceivableReportVO> page) {
         if (page == null || CollectionUtils.isEmpty(page.getRecords())) {
         if (page == null || CollectionUtils.isEmpty(page.getRecords())) {

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

@@ -69,6 +69,11 @@ public class ReceivableReportVO {
     private BigDecimal commissionRatio;
     private BigDecimal commissionRatio;
 
 
     /**
     /**
+     * 实用率和值
+     */
+    private BigDecimal paid;
+
+    /**
      * 预估入账金额（原始币种）
      * 预估入账金额（原始币种）
      */
      */
     @Schema(description = "预估入账金额（原始币种）")
     @Schema(description = "预估入账金额（原始币种）")

yd-csf-service/src/main/resources/mappers/CommissionExpectedMapper.xml

@@ -83,6 +83,7 @@
             MAX(ce.total_period) as totalPeriod,
             MAX(ce.total_period) as totalPeriod,
             MAX(ce.commission_date) as commissionDate,
             MAX(ce.commission_date) as commissionDate,
             ifnull(sum(ce.commission_ratio), 0) as commissionRatio,
             ifnull(sum(ce.commission_ratio), 0) as commissionRatio,
+            ifnull(sum(ce.paid_ratio), 0) as paid,
             ifnull(sum(ce.amount), 0) as amount,
             ifnull(sum(ce.amount), 0) as amount,
             MAX(ce.currency) as currency,
             MAX(ce.currency) as currency,
             ifnull(sum(ce.expected_amount), 0) as hkdAmount,
             ifnull(sum(ce.expected_amount), 0) as hkdAmount,
@@ -129,6 +130,7 @@
             ce.total_period as totalPeriod,
             ce.total_period as totalPeriod,
             ce.commission_date as commissionDate,
             ce.commission_date as commissionDate,
             null as commissionRatio,
             null as commissionRatio,
+            null as paid,
             ifnull(ce.amount, 0) as amount,
             ifnull(ce.amount, 0) as amount,
             ce.currency as currency,
             ce.currency as currency,
             ifnull(ce.expected_amount, 0) as hkdAmount,
             ifnull(ce.expected_amount, 0) as hkdAmount,