push

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

@@ -235,12 +235,7 @@ public class ApiCommissionExpectedController {
         List<CommissionExpected> commissionExpectedList = commissionExpectedService.list(queryWrapper);
         // 计算统计数据
         List<Long> expectedIds = commissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList());
-        CommissionExpectedStatisticsVO expectedStatisticsVO = commissionExpectedService.getExpectedStatisticsNew(expectedIds);
-        CommissionExpectedStatisticsNewVO statisticsNewVO = null;
-        if (expectedStatisticsVO != null) {
-            statisticsNewVO = new CommissionExpectedStatisticsNewVO();
-            BeanUtils.copyProperties(expectedStatisticsVO,statisticsNewVO);
-        }
+        CommissionExpectedStatisticsNewVO statisticsNewVO = commissionExpectedService.getExpectedStatisticsNew(expectedIds);
         // 组装返回值
         QueryCommissionExpectedByPageNewResponse response = new QueryCommissionExpectedByPageNewResponse();
         response.setExpectedStatisticsVO(statisticsNewVO);

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

@@ -10,10 +10,7 @@ import com.yd.csf.service.dto.CommissionExpectedUpdateRequest;
 import com.yd.csf.service.model.CommissionExpected;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yd.csf.service.model.Policy;
-import com.yd.csf.service.vo.CommissionExpectedNewVO;
-import com.yd.csf.service.vo.CommissionExpectedStatisticsVO;
-import com.yd.csf.service.vo.CommissionExpectedVO;
-import com.yd.csf.service.vo.ReceivableReportVO;
+import com.yd.csf.service.vo.*;
 import com.yd.product.feign.response.expectedspecies.ApiExpectedSpeciesListResponse;
 
 import java.io.IOException;
@@ -62,7 +59,7 @@ public interface CommissionExpectedService extends IService<CommissionExpected>
 
     CommissionExpectedStatisticsVO getExpectedStatistics(List<Long> expectedIds);
 
-    CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<Long> expectedIds);
+    CommissionExpectedStatisticsNewVO getExpectedStatisticsNew(List<Long> expectedIds);
 
     CommissionExpected getByBizId(String commissionExpectedBizId);
 

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

@@ -30,10 +30,7 @@ import com.yd.csf.service.service.*;
 import com.yd.csf.service.dao.CommissionExpectedMapper;
 import com.yd.csf.service.model.SpeciesCondition;
 import com.yd.csf.service.helper.SpeciesConditionMatcher;
-import com.yd.csf.service.vo.CommissionExpectedNewVO;
-import com.yd.csf.service.vo.CommissionExpectedStatisticsVO;
-import com.yd.csf.service.vo.CommissionExpectedVO;
-import com.yd.csf.service.vo.ReceivableReportVO;
+import com.yd.csf.service.vo.*;
 import com.yd.insurance.base.feign.client.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyFeignClient;
 import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
 import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageResponse;
@@ -890,7 +887,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
     }
 
     @Override
-    public CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<Long> expectedIds) {
+    public CommissionExpectedStatisticsNewVO getExpectedStatisticsNew(List<Long> expectedIds) {
         // 空集合直接返回空统计
         if (CollectionUtils.isEmpty(expectedIds)) {
             return emptyStatistics();
@@ -926,6 +923,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
 
         // 计算总保费（HKD）
         BigDecimal totalPremium = BigDecimal.ZERO;
+        BigDecimal fromTotalPremium = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(policyNoSet)) {
             List<Policy> policyList = policyService.lambdaQuery()
                     .in(Policy::getPolicyNo, policyNoSet)
@@ -936,12 +934,13 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                     BigDecimal rate = queryExchangeRateByFeign(policy.getCurrency(), "HKD");
                     if (rate == null) rate = BigDecimal.ONE;
                     totalPremium = totalPremium.add(policy.getTotalPaymentPremium().multiply(rate));
+                    fromTotalPremium = fromTotalPremium.add(policy.getTotalPaymentPremium());
                 }
             }
         }
 
         // 组装返回对象
-        CommissionExpectedStatisticsVO vo = new CommissionExpectedStatisticsVO();
+        CommissionExpectedStatisticsNewVO vo = new CommissionExpectedStatisticsNewVO();
         vo.setTotalAmount(totalAmount);
         vo.setTotalPaidAmount(totalPaidAmount);
         vo.setPendingPaidAmount(totalAmount.subtract(totalPaidAmount));
@@ -956,6 +955,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
 
         vo.setTotalPolicyCount(policyNoSet.size());
         vo.setTotalPremium(totalPremium);
+        vo.setFromTotalPremium(fromTotalPremium);
         vo.setPolicyNos(null); // 原字段可能用于其他逻辑，此处置空
         return vo;
     }
@@ -963,8 +963,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
     /**
      * 返回空的统计对象
      */
-    private CommissionExpectedStatisticsVO emptyStatistics() {
-        CommissionExpectedStatisticsVO vo = new CommissionExpectedStatisticsVO();
+    private CommissionExpectedStatisticsNewVO emptyStatistics() {
+        CommissionExpectedStatisticsNewVO vo = new CommissionExpectedStatisticsNewVO();
         vo.setTotalAmount(BigDecimal.ZERO);
         vo.setTotalPaidAmount(BigDecimal.ZERO);
         vo.setPendingPaidAmount(BigDecimal.ZERO);

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

@@ -47,6 +47,11 @@ public class CommissionExpectedStatisticsNewVO {
 //    @Schema(description = "总保费（HKD）")
     private BigDecimal totalPremium;
 
+    /**
+     * 原币种总保费
+     */
+    private BigDecimal fromTotalPremium;
+
     @JsonIgnore
     private String policyNos;
 }