diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/ListVehRebate.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/ListVehRebate.java index 9aad34ec6b..bc28ad7a84 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/ListVehRebate.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/ListVehRebate.java @@ -3,6 +3,8 @@ package com.yxt.anrui.reportcenter.api.vehRebate; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + @Data public class ListVehRebate { @@ -13,21 +15,21 @@ public class ListVehRebate { @ApiModelProperty("实销日期") private String realSaleTime; @ApiModelProperty("预提返利") - private String rebateEstimate; + private BigDecimal rebateEstimate; @ApiModelProperty("上传") - private String rebateUpload; + private BigDecimal rebateUpload; @ApiModelProperty("二次上传") - private String rebateSecondaryUpload; + private BigDecimal rebateSecondaryUpload; @ApiModelProperty("待确定") - private String rebateStayDetermine; + private BigDecimal rebateStayDetermine; @ApiModelProperty("调整") - private String rebateAdjust; + private BigDecimal rebateAdjust; @ApiModelProperty("未上传") - private String rebateNoUpload; + private BigDecimal rebateNoUpload; @ApiModelProperty("费用预提") - private String feesEstimate; + private BigDecimal feesEstimate; @ApiModelProperty("上传") - private String feeUpload; + private BigDecimal feeUpload; @ApiModelProperty("车型") private String model; @ApiModelProperty("品牌") diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/TotalVehRebate.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/TotalVehRebate.java index 11d752e859..6137c83ccf 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/TotalVehRebate.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/TotalVehRebate.java @@ -4,42 +4,25 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + @Data -public class TotalVehRebate implements Vo { - private static final long serialVersionUID = -8631337422991366458L; +public class TotalVehRebate { - @ApiModelProperty("sid") - private String sid; - @ApiModelProperty("合同状态") - private String contractType; - @ApiModelProperty("合同编号") - private String contractId; - @ApiModelProperty("欠款金额") - private String arrearsMoney; - @ApiModelProperty("承诺汇款日期") - private String paymentDate; - @ApiModelProperty("申请人") - private String applicant; - @ApiModelProperty("数量") - private String number; - @ApiModelProperty("原因") - private String reason; - @ApiModelProperty("创建日期") - private String date; - @ApiModelProperty("客户名称") - private String customerName; - @ApiModelProperty("是否显示办理按钮") - private Boolean showUpdateBtn; - @ApiModelProperty("是否显示删除按钮") - private Boolean showDeleteBtn; - @ApiModelProperty("是否显示领票按钮") - private Boolean showGetInvoiceBtn; - @ApiModelProperty("车型") - private String model; - @ApiModelProperty("销售类型") - private String type; - @ApiModelProperty("车架号(拼接)") - private String vinNo; - @ApiModelProperty("是否领取发票原件") - private String isLQOrigInvoice; + @ApiModelProperty("预提返利") + private BigDecimal rebateEstimate; + @ApiModelProperty("上传") + private BigDecimal rebateUpload; + @ApiModelProperty("二次上传") + private BigDecimal rebateSecondaryUpload; + @ApiModelProperty("待确定") + private BigDecimal rebateStayDetermine; + @ApiModelProperty("调整") + private BigDecimal rebateAdjust; + @ApiModelProperty("未上传") + private BigDecimal rebateNoUpload; + @ApiModelProperty("费用预提") + private BigDecimal feesEstimate; + @ApiModelProperty("上传") + private BigDecimal feeUpload; } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateService.java index efc1663487..00dfd31cc5 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateService.java @@ -39,8 +39,10 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import java.util.Objects; @Service public class AppVehRebateService { @@ -88,20 +90,21 @@ public class AppVehRebateService { } } scmVehRebateStatQueryPagerQuery.setParams(scmVehRebateStatQuery); + scmVehRebateStatQueryPagerQuery.setCurrent(query.getCurrent()); PagerVo data = scmVehRebateFeign.statistics(scmVehRebateStatQueryPagerQuery).getData(); for (ScmVehRebateStatVo record : data.getRecords()) { ListVehRebate listVehRebate = new ListVehRebate(); listVehRebate.setVin(record.getVinNo()); listVehRebate.setSaleTime(record.getSaleDate()); listVehRebate.setRealSaleTime(record.getAcSaleDate()); - listVehRebate.setRebateEstimate(record.getEstimateRebate().toString()); - listVehRebate.setRebateUpload(record.getUploadMoney().toString()); - listVehRebate.setRebateSecondaryUpload(record.getSecondaryUploadMoney().toString()); - listVehRebate.setRebateStayDetermine(record.getStayDetermineMoney().toString()); - listVehRebate.setRebateAdjust(record.getAdjustmentMoney().toString()); - listVehRebate.setRebateNoUpload(record.getNotUploadMoney().toString()); - listVehRebate.setFeesEstimate(record.getExpectCost().toString()); - listVehRebate.setFeeUpload(record.getMoney().toString()); + listVehRebate.setRebateEstimate(record.getEstimateRebate()); + listVehRebate.setRebateUpload(record.getUploadMoney()); + listVehRebate.setRebateSecondaryUpload(record.getSecondaryUploadMoney()); + listVehRebate.setRebateStayDetermine(record.getStayDetermineMoney()); + listVehRebate.setRebateAdjust(record.getAdjustmentMoney()); + listVehRebate.setRebateNoUpload(record.getNotUploadMoney()); + listVehRebate.setFeesEstimate(record.getExpectCost()); + listVehRebate.setFeeUpload(record.getMoney()); listVehRebate.setModel(record.getVehModelName()); listVehRebate.setBrand(record.getBrandName()); listVehRebate.setBuySystem(record.getPurchaseSystemName()); @@ -111,6 +114,18 @@ public class AppVehRebateService { listVehRebates.add(listVehRebate); } vehRebatePageVo.setList(listVehRebates); + scmVehRebateStatQueryPagerQuery.setCurrent(1); + scmVehRebateStatQueryPagerQuery.setSize(1000); + PagerVo data2 = scmVehRebateFeign.statistics(scmVehRebateStatQueryPagerQuery).getData(); + totalVehRebate.setRebateEstimate(data2.getRecords().stream().map(ScmVehRebateStatVo::getEstimateRebate).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalVehRebate.setRebateUpload(data2.getRecords().stream().map(ScmVehRebateStatVo::getUploadMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalVehRebate.setRebateSecondaryUpload(data2.getRecords().stream().map(ScmVehRebateStatVo::getSecondaryUploadMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalVehRebate.setRebateStayDetermine(data2.getRecords().stream().map(ScmVehRebateStatVo::getStayDetermineMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalVehRebate.setRebateAdjust(data2.getRecords().stream().map(ScmVehRebateStatVo::getAdjustmentMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalVehRebate.setRebateNoUpload(data2.getRecords().stream().map(ScmVehRebateStatVo::getNotUploadMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalVehRebate.setFeesEstimate(data2.getRecords().stream().map(ScmVehRebateStatVo::getExpectCost).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); + totalVehRebate.setFeeUpload(data2.getRecords().stream().map(ScmVehRebateStatVo::getMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); + vehRebatePageVo.setTotal(totalVehRebate); vehRebatePageVo.setPages((int) data.getPages()); return rb.success().setData(vehRebatePageVo); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.java index b49ddf308a..1e4cbfa17b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.java @@ -17,6 +17,5 @@ import java.util.List; @Mapper public interface LoanRelieveMortgageMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.xml index 21aa6e0811..f6dba37edf 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.xml @@ -5,7 +5,7 @@