push

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

@@ -232,7 +232,7 @@ public class ApiCommissionExpectedController {
         List<Long> expectedIds = allExpectedList.stream()
                 .map(CommissionExpected::getId)
                 .collect(Collectors.toList());
-        CommissionExpectedStatisticsNewVO statisticsNewVO = commissionExpectedService
+        CommissionExpectedStatisticsVO statisticsNewVO = commissionExpectedService
                 .getExpectedStatisticsNew(expectedIds);
 
         // 获取混合分页结果
@@ -338,7 +338,7 @@ public class ApiCommissionExpectedController {
         List<Long> allExpectedIdList = allCommissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList());
 
         // 查询统计数据（基于所有符合条件的记录）
-        CommissionExpectedStatisticsVO statisticsVO = commissionExpectedService.getExpectedStatistics(allExpectedIdList);
+        CommissionExpectedStatisticsVO statisticsVO = commissionExpectedService.getExpectedStatisticsNew(allExpectedIdList);
 
         // 应收款报表分页查询 - 按保单号和期数维度统计
         Page<ReceivableReportVO> reportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());

yd-csf-api/src/main/java/com/yd/csf/api/dto/QueryCommissionExpectedByPageNewResponse.java

@@ -15,7 +15,7 @@ public class QueryCommissionExpectedByPageNewResponse {
      * 预计来佣统计信息
      */
 //    @Schema(description = "预计来佣统计信息")
-    private CommissionExpectedStatisticsNewVO expectedStatisticsVO;
+    private CommissionExpectedStatisticsVO expectedStatisticsVO;
 
     /**
      * 预计来佣分页列表

yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionExpectedService.java

@@ -59,7 +59,7 @@ public interface CommissionExpectedService extends IService<CommissionExpected>
 
     CommissionExpectedStatisticsVO getExpectedStatistics(List<Long> expectedIds);
 
-    CommissionExpectedStatisticsNewVO getExpectedStatisticsNew(List<Long> expectedIds);
+    CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<Long> expectedIds);
 
     CommissionExpected getByBizId(String commissionExpectedBizId);
 

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

@@ -909,7 +909,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
     }
 
     @Override
-    public CommissionExpectedStatisticsNewVO getExpectedStatisticsNew(List<Long> expectedIds) {
+    public CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<Long> expectedIds) {
         // 空集合直接返回空统计
         if (CollectionUtils.isEmpty(expectedIds)) {
             return emptyStatistics();
@@ -968,7 +968,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         }
 
         // 组装返回对象
-        CommissionExpectedStatisticsNewVO vo = new CommissionExpectedStatisticsNewVO();
+        CommissionExpectedStatisticsVO vo = new CommissionExpectedStatisticsVO();
         vo.setTotalAmount(totalAmount);
         vo.setTotalPaidAmount(totalPaidAmount);
         vo.setPendingPaidAmount(totalAmount.subtract(totalPaidAmount));
@@ -995,8 +995,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
     /**
      * 返回空的统计对象
      */
-    private CommissionExpectedStatisticsNewVO emptyStatistics() {
-        CommissionExpectedStatisticsNewVO vo = new CommissionExpectedStatisticsNewVO();
+    private CommissionExpectedStatisticsVO emptyStatistics() {
+        CommissionExpectedStatisticsVO vo = new CommissionExpectedStatisticsVO();
         vo.setTotalAmount(BigDecimal.ZERO);
         vo.setTotalPaidAmount(BigDecimal.ZERO);
         vo.setPendingPaidAmount(BigDecimal.ZERO);

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

@@ -14,39 +14,83 @@ public class CommissionExpectedStatisticsVO {
     /**
      * 预计入账金额（HKD）
      */
-    @Schema(description = "预计入账金额（HKD）")
+//    @Schema(description = "预计入账金额（HKD）")
     private BigDecimal totalAmount;
 
     /**
      * 已入账金额（HKD）
      */
-    @Schema(description = "已入账金额（HKD）")
+//    @Schema(description = "已入账金额（HKD）")
     private BigDecimal totalPaidAmount;
 
     /**
      * 待入账金额（HKD）
      */
-    @Schema(description = "待入账金额（HKD）")
+//    @Schema(description = "待入账金额（HKD）")
     private BigDecimal pendingPaidAmount;
 
     /**
      * 已入账比例 %（已入账金额/总金额）
      */
-    @Schema(description = "已入账比例 %（已入账金额/总金额）")
+//    @Schema(description = "已入账比例 %（已入账金额/总金额）")
     private BigDecimal paidAmountRatio;
 
     /**
      * 总保单数
      */
-    @Schema(description = "总保单数")
+//    @Schema(description = "总保单数")
     private Integer totalPolicyCount;
 
     /**
      * 总保费（HKD）
      */
-    @Schema(description = "总保费（HKD）")
+//    @Schema(description = "总保费（HKD）")
     private BigDecimal totalPremium;
 
+    /**
+     * 原币种总保费
+     */
+    private BigDecimal fromTotalPremium;
+
     @JsonIgnore
     private String policyNos;
+
+//    /**
+//     * 预计入账金额（HKD）
+//     */
+//    @Schema(description = "预计入账金额（HKD）")
+//    private BigDecimal totalAmount;
+//
+//    /**
+//     * 已入账金额（HKD）
+//     */
+//    @Schema(description = "已入账金额（HKD）")
+//    private BigDecimal totalPaidAmount;
+//
+//    /**
+//     * 待入账金额（HKD）
+//     */
+//    @Schema(description = "待入账金额（HKD）")
+//    private BigDecimal pendingPaidAmount;
+//
+//    /**
+//     * 已入账比例 %（已入账金额/总金额）
+//     */
+//    @Schema(description = "已入账比例 %（已入账金额/总金额）")
+//    private BigDecimal paidAmountRatio;
+//
+//    /**
+//     * 总保单数
+//     */
+//    @Schema(description = "总保单数")
+//    private Integer totalPolicyCount;
+//
+//    /**
+//     * 总保费（HKD）
+//     */
+//    @Schema(description = "总保费（HKD）")
+//    private BigDecimal totalPremium;
+//
+//    @JsonIgnore
+//    private String policyNos;
 }