Skip to content

Y
yd-csf
Commit 9f7ef7df by zhangxingmin
Options

push

parent 2f3b5db7
Showing with 16 additions and 19 deletions
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java
...@@ -235,12 +235,7 @@ public class ApiCommissionExpectedController { ...@@ -235,12 +235,7 @@ public class ApiCommissionExpectedController {
List<CommissionExpected> commissionExpectedList = commissionExpectedService.list(queryWrapper); List<CommissionExpected> commissionExpectedList = commissionExpectedService.list(queryWrapper);
// 计算统计数据 // 计算统计数据
List<Long> expectedIds = commissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList()); List<Long> expectedIds = commissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList());
CommissionExpectedStatisticsVO expectedStatisticsVO = commissionExpectedService.getExpectedStatisticsNew(expectedIds); CommissionExpectedStatisticsNewVO statisticsNewVO = commissionExpectedService.getExpectedStatisticsNew(expectedIds);
CommissionExpectedStatisticsNewVO statisticsNewVO = null;
if (expectedStatisticsVO != null) {
statisticsNewVO = new CommissionExpectedStatisticsNewVO();
BeanUtils.copyProperties(expectedStatisticsVO,statisticsNewVO);
}
// 组装返回值 // 组装返回值
QueryCommissionExpectedByPageNewResponse response = new QueryCommissionExpectedByPageNewResponse(); QueryCommissionExpectedByPageNewResponse response = new QueryCommissionExpectedByPageNewResponse();
response.setExpectedStatisticsVO(statisticsNewVO); 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; ...@@ -10,10 +10,7 @@ import com.yd.csf.service.dto.CommissionExpectedUpdateRequest;
import com.yd.csf.service.model.CommissionExpected; import com.yd.csf.service.model.CommissionExpected;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yd.csf.service.model.Policy; import com.yd.csf.service.model.Policy;
import com.yd.csf.service.vo.CommissionExpectedNewVO; import com.yd.csf.service.vo.*;
import com.yd.csf.service.vo.CommissionExpectedStatisticsVO;
import com.yd.csf.service.vo.CommissionExpectedVO;
import com.yd.csf.service.vo.ReceivableReportVO;
import com.yd.product.feign.response.expectedspecies.ApiExpectedSpeciesListResponse; import com.yd.product.feign.response.expectedspecies.ApiExpectedSpeciesListResponse;
import java.io.IOException; import java.io.IOException;
...@@ -62,7 +59,7 @@ public interface CommissionExpectedService extends IService<CommissionExpected> ...@@ -62,7 +59,7 @@ public interface CommissionExpectedService extends IService<CommissionExpected>
CommissionExpectedStatisticsVO getExpectedStatistics(List<Long> expectedIds); CommissionExpectedStatisticsVO getExpectedStatistics(List<Long> expectedIds);
CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<Long> expectedIds); CommissionExpectedStatisticsNewVO getExpectedStatisticsNew(List<Long> expectedIds);
CommissionExpected getByBizId(String commissionExpectedBizId); 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.*; ...@@ -30,10 +30,7 @@ import com.yd.csf.service.service.*;
import com.yd.csf.service.dao.CommissionExpectedMapper; import com.yd.csf.service.dao.CommissionExpectedMapper;
import com.yd.csf.service.model.SpeciesCondition; import com.yd.csf.service.model.SpeciesCondition;
import com.yd.csf.service.helper.SpeciesConditionMatcher; import com.yd.csf.service.helper.SpeciesConditionMatcher;
import com.yd.csf.service.vo.CommissionExpectedNewVO; import com.yd.csf.service.vo.*;
import com.yd.csf.service.vo.CommissionExpectedStatisticsVO;
import com.yd.csf.service.vo.CommissionExpectedVO;
import com.yd.csf.service.vo.ReceivableReportVO;
import com.yd.insurance.base.feign.client.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyFeignClient; import com.yd.insurance.base.feign.client.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyFeignClient;
import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest; import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageResponse; import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageResponse;
...@@ -890,7 +887,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -890,7 +887,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
} }
@Override @Override
public CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<Long> expectedIds) { public CommissionExpectedStatisticsNewVO getExpectedStatisticsNew(List<Long> expectedIds) {
// 空集合直接返回空统计 // 空集合直接返回空统计
if (CollectionUtils.isEmpty(expectedIds)) { if (CollectionUtils.isEmpty(expectedIds)) {
return emptyStatistics(); return emptyStatistics();
...@@ -926,6 +923,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -926,6 +923,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
// 计算总保费（HKD） // 计算总保费（HKD）
BigDecimal totalPremium = BigDecimal.ZERO; BigDecimal totalPremium = BigDecimal.ZERO;
BigDecimal fromTotalPremium = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(policyNoSet)) { if (CollectionUtils.isNotEmpty(policyNoSet)) {
List<Policy> policyList = policyService.lambdaQuery() List<Policy> policyList = policyService.lambdaQuery()
.in(Policy::getPolicyNo, policyNoSet) .in(Policy::getPolicyNo, policyNoSet)
...@@ -936,12 +934,13 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -936,12 +934,13 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
BigDecimal rate = queryExchangeRateByFeign(policy.getCurrency(), "HKD"); BigDecimal rate = queryExchangeRateByFeign(policy.getCurrency(), "HKD");
if (rate == null) rate = BigDecimal.ONE; if (rate == null) rate = BigDecimal.ONE;
totalPremium = totalPremium.add(policy.getTotalPaymentPremium().multiply(rate)); totalPremium = totalPremium.add(policy.getTotalPaymentPremium().multiply(rate));
fromTotalPremium = fromTotalPremium.add(policy.getTotalPaymentPremium());
} }
} }
} }
// 组装返回对象 // 组装返回对象
CommissionExpectedStatisticsVO vo = new CommissionExpectedStatisticsVO(); CommissionExpectedStatisticsNewVO vo = new CommissionExpectedStatisticsNewVO();
vo.setTotalAmount(totalAmount); vo.setTotalAmount(totalAmount);
vo.setTotalPaidAmount(totalPaidAmount); vo.setTotalPaidAmount(totalPaidAmount);
vo.setPendingPaidAmount(totalAmount.subtract(totalPaidAmount)); vo.setPendingPaidAmount(totalAmount.subtract(totalPaidAmount));
...@@ -956,6 +955,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -956,6 +955,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
vo.setTotalPolicyCount(policyNoSet.size()); vo.setTotalPolicyCount(policyNoSet.size());
vo.setTotalPremium(totalPremium); vo.setTotalPremium(totalPremium);
vo.setFromTotalPremium(fromTotalPremium);
vo.setPolicyNos(null); // 原字段可能用于其他逻辑，此处置空 vo.setPolicyNos(null); // 原字段可能用于其他逻辑，此处置空
return vo; return vo;
} }
...@@ -963,8 +963,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -963,8 +963,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
/** /**
* 返回空的统计对象 * 返回空的统计对象
*/ */
private CommissionExpectedStatisticsVO emptyStatistics() { private CommissionExpectedStatisticsNewVO emptyStatistics() {
CommissionExpectedStatisticsVO vo = new CommissionExpectedStatisticsVO(); CommissionExpectedStatisticsNewVO vo = new CommissionExpectedStatisticsNewVO();
vo.setTotalAmount(BigDecimal.ZERO); vo.setTotalAmount(BigDecimal.ZERO);
vo.setTotalPaidAmount(BigDecimal.ZERO); vo.setTotalPaidAmount(BigDecimal.ZERO);
vo.setPendingPaidAmount(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 { ...@@ -47,6 +47,11 @@ public class CommissionExpectedStatisticsNewVO {
// @Schema(description = "总保费（HKD）") // @Schema(description = "总保费（HKD）")
private BigDecimal totalPremium; private BigDecimal totalPremium;
/**
* 原币种总保费
*/
private BigDecimal fromTotalPremium;
@JsonIgnore @JsonIgnore
private String policyNos; private String policyNos;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment