Merge remote-tracking branch 'origin/master'

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("品牌")

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 {
+public class TotalVehRebate {
-    private static final long serialVersionUID = -8631337422991366458L;
 
-    @ApiModelProperty("sid")
+    @ApiModelProperty("预提返利")
-    private String sid;
+    private BigDecimal rebateEstimate;
-    @ApiModelProperty("合同状态")
+    @ApiModelProperty("上传")
-    private String contractType;
+    private BigDecimal rebateUpload;
-    @ApiModelProperty("合同编号")
+    @ApiModelProperty("二次上传")
-    private String contractId;
+    private BigDecimal rebateSecondaryUpload;
-    @ApiModelProperty("欠款金额")
+    @ApiModelProperty("待确定")
-    private String arrearsMoney;
+    private BigDecimal rebateStayDetermine;
-    @ApiModelProperty("承诺汇款日期")
+    @ApiModelProperty("调整")
-    private String paymentDate;
+    private BigDecimal rebateAdjust;
-    @ApiModelProperty("申请人")
+    @ApiModelProperty("未上传")
-    private String applicant;
+    private BigDecimal rebateNoUpload;
-    @ApiModelProperty("数量")
+    @ApiModelProperty("费用预提")
-    private String number;
+    private BigDecimal feesEstimate;
-    @ApiModelProperty("原因")
+    @ApiModelProperty("上传")
-    private String reason;
+    private BigDecimal feeUpload;
-    @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;
 }

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<ScmVehRebateStatVo> 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.setRebateEstimate(record.getEstimateRebate());
-            listVehRebate.setRebateUpload(record.getUploadMoney().toString());
+            listVehRebate.setRebateUpload(record.getUploadMoney());
-            listVehRebate.setRebateSecondaryUpload(record.getSecondaryUploadMoney().toString());
+            listVehRebate.setRebateSecondaryUpload(record.getSecondaryUploadMoney());
-            listVehRebate.setRebateStayDetermine(record.getStayDetermineMoney().toString());
+            listVehRebate.setRebateStayDetermine(record.getStayDetermineMoney());
-            listVehRebate.setRebateAdjust(record.getAdjustmentMoney().toString());
+            listVehRebate.setRebateAdjust(record.getAdjustmentMoney());
-            listVehRebate.setRebateNoUpload(record.getNotUploadMoney().toString());
+            listVehRebate.setRebateNoUpload(record.getNotUploadMoney());
-            listVehRebate.setFeesEstimate(record.getExpectCost().toString());
+            listVehRebate.setFeesEstimate(record.getExpectCost());
-            listVehRebate.setFeeUpload(record.getMoney().toString());
+            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<ScmVehRebateStatVo> 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);
     }

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<LoanRelieveMortgage> {
 
-
     IPage<LoanRelieveMortgageVo> listPage(IPage<LoanRelieveMortgage> page, @Param(Constants.WRAPPER) QueryWrapper<LoanRelieveMortgage> qw);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.xml

@@ -5,7 +5,7 @@
 
     <select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageVo">
         SELECT sid,
-        `state`,
+        state,
         useOrgName,
         dept,
         salesman,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageService.java

@@ -109,7 +109,7 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo
         //=======================
         //移交状态
         if (StringUtils.isNotBlank(pagerQuery.getState())) {
-            qw.like("`state`", pagerQuery.getState());
+            qw.like("state", pagerQuery.getState());
         }
         //销售专员
         if (StringUtils.isNotBlank(pagerQuery.getSalesman())) {
@@ -158,7 +158,7 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo
                 );
 
         qw.eq("isDelete", 0);
-        qw.orderBy(true, false, "`state`")
+        qw.orderBy(true, false, "state")
                 .orderBy(true, false, "createTime")
         ;
         IPage<LoanRelieveMortgageVo> pagging = baseMapper.listPage(page, qw);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml

@@ -332,7 +332,6 @@
 				) a
 		) lfd_sum ON lfd_sum.busVinSid = ss.busVinSid
 		GROUP BY ss.busVinSid having beMoney>0
-
 	</select>
 
 	<select id="getYqjehsqs2" resultType="java.lang.String">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java

@@ -423,7 +423,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
             loanSecondarySalesNotVehDetailsVo.setConfigSid(loanSecondarySalesVehVo.getConfigSid());
             loanSecondarySalesNotVehDetailsVo.setBusVinSid(loanSecondarySalesVehVo.getBusVinSid());
             loanSecondarySalesNotVehDetailsVos.add(loanSecondarySalesNotVehDetailsVo);
-            AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(loanSecondarySalesVehVo.getBusSid());
+            AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(loanSecondarySalesVehVo.getBusVinSid());
             if (alrepaidAndArrVo != null) {
                 if (StringUtils.isNotBlank(alrepaidAndArrVo.getCurrentBeMoney())) {
                     bigDecimal = bigDecimal.add(new BigDecimal(alrepaidAndArrVo.getCurrentBeMoney()));

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -52,6 +52,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory;
+import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageSaveDto;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForFundVoucher;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
@@ -70,6 +71,7 @@ import com.yxt.anrui.riskcenter.api.loanvoucher.RskPaymentVoucher;
 import com.yxt.anrui.riskcenter.api.loanvoucher.RskVoucher;
 import com.yxt.anrui.riskcenter.biz.loanfinbank.LoanFinBankService;
 import com.yxt.anrui.riskcenter.biz.loanpushfundhistory.LoanPushFundHistoryService;
+import com.yxt.anrui.riskcenter.biz.loanrelievemortgage.LoanRelieveMortgageService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
@@ -200,6 +202,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     private LoanPushFundHistoryService loanPushFundHistoryService;
     @Autowired
     private LoanFinBankService loanFinBankService;
+    @Autowired
+    private LoanRelieveMortgageService loanRelieveMortgageService;
 
 
     public PagerVo<LoanSettleApplyVo> listPageVo(PagerQuery<LoanSettleApplyQuery> pq) {
@@ -976,6 +980,29 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     pushSettleVoucher2(loanSettleApply, check, settleVoucherVos);
                 }
                 baseMapper.updateById(loanSettleApply);
+                LoanRelieveMortgageSaveDto loanRelieveMortgageSaveDto = new LoanRelieveMortgageSaveDto();
+                loanRelieveMortgageSaveDto.setCreateBySid(loanSettleApply.getCreateBySid());
+                loanRelieveMortgageSaveDto.setUseOrgSid(loanSettleApply.getUseOrgSid());
+                loanRelieveMortgageSaveDto.setUseOrgName(loanSettleApply.getUseOrgName());
+                loanRelieveMortgageSaveDto.setOrgSidPath(loanSettleApply.getOrgSidPath());
+                loanRelieveMortgageSaveDto.setBusVinSid(loanSettleApply.getBusVinSid());
+                loanRelieveMortgageSaveDto.setVinNo(loanSettleApply.getVinNo());
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(loanSettleApply.getBusVinSid()).getData();
+                loanRelieveMortgageSaveDto.setVehSid(busSalesOrderVehicle.getLinkSid());
+                loanRelieveMortgageSaveDto.setVehMark(loanSettleApply.getVehMark());
+                loanRelieveMortgageSaveDto.setLoanContractNo(loanSettleApply.getLoanContractNo());
+                loanRelieveMortgageSaveDto.setBankContractNo(loanSettleApply.getBankContractNo());
+                loanRelieveMortgageSaveDto.setDept(loanSettleApply.getCreateDept());
+                loanRelieveMortgageSaveDto.setDeptSid(loanSettleApply.getCreateDeptSid());
+                BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+                loanRelieveMortgageSaveDto.setSalesman(busSalesOrder.getStaffName());
+                loanRelieveMortgageSaveDto.setSalesmanSid(busSalesOrder.getStaffSid());
+                loanRelieveMortgageSaveDto.setBorrowerName(loanSettleApply.getLoanName());
+                loanRelieveMortgageSaveDto.setBorrowerSid(loanSettleApply.getLoanSid());
+                loanRelieveMortgageSaveDto.setCustomer(loanSettleApply.getCustomerName());
+                loanRelieveMortgageSaveDto.setCustomerSid(loanSettleApply.getCustomerSid());
+                loanRelieveMortgageSaveDto.setBankName(loanSettleApply.getBankName());
+                loanRelieveMortgageService.saveRelieveMortgage(loanRelieveMortgageSaveDto);
             } else {
                 //极光推送
                 loanSettleApply = fetchBySid(businessSid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -430,7 +430,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 );
         //移动端条件
         if (StringUtils.isNotBlank(query.getNames())) {
-            qw.and(wrapper -> wrapper.like("r.useOrgName", query.getUseOrgName()).or().like("o.name", query.getNames()).or().like("r.vinNo", query.getNames()).or().like("r.vehModelName", query.getNames()).or().like("r.brandName", query.getNames()).or().like("r.purchaseSystemName", query.getNames()));
+            qw.and(wrapper -> wrapper.like("r.useOrgName", query.getNames()).or().like("o.name", query.getNames()).or().like("r.vinNo", query.getNames()).or().like("r.vehModelName", query.getNames()).or().like("r.brandName", query.getNames()).or().like("r.purchaseSystemName", query.getNames()));
         }
         qw.groupBy("r.vehSid");
         qw.orderByDesc("r.createTime");