Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java

@@ -77,4 +77,7 @@ public interface FinUncollectedReceivablesDetailedJRFeign {
     @GetMapping("/getUnJrByPayCostTitleKeyAndBusSid")
     public ResultBean<FinUncollectedReceivablesDetailedJR> getUnJrByPayCostTitleKeyAndBusSid(@RequestParam("key") String key ,@RequestParam("busSid") String busSid);
 
+    @ApiOperation("查询金融应收所有应收款")
+    @PostMapping("/selByBusSid")
+    ResultBean<List<FinUncollectedReceivablesDetailedJR>> selByBusSid(@RequestBody List<String> busSids);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -4436,7 +4436,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                        CollectionVoucher.CollectionVoucherDetail d = getReturnBackMoneyVoucher(v, collectionDate);
                        voucherDetails.add(d);
                    }
-                   //推送间还待转付列表
+                   //推送间还待转付列表--若回购则推送已转付的间还还款记录、若不是回购则间还待转付列表。
                    if (v.getReceivablesName().equals("月还") || v.getReceivablesName().equals("资方逾期利息")) {
                        if (null != planDetails) {
                            if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java

@@ -97,4 +97,6 @@ IPage<AppFinUncollectedReceivablesDetailedRskVo> getRskPaymentDetailsList(IPage<
     void saveList(@Param("list") List<FinUncollectedReceivablesDetailedJR> list);
 
     FinUncollectedReceivablesDetailedJR getUnJrByPayCostTitleKeyAndBusSid(@Param("key") String key, @Param("busSid")String busSid);
+
+    List<FinUncollectedReceivablesDetailedJR> selByBusSid(@Param("busSids") List<String> busSids);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml

@@ -471,4 +471,18 @@
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR">
         select * from anrui_fin.fin_uncollected_receivables_detailed_jr where payCostTitleKey = #{key} and busSid = #{busSid}
     </select>
+
+    <select id="selByBusSid"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR">
+        SELECT
+            *
+        FROM
+            anrui_fin.fin_uncollected_receivables_detailed_jr j
+        <if test="busSids != null and busSids.size() != 0">
+            WHERE busSid IN
+            <foreach collection="busSids" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRRest.java

@@ -25,37 +25,20 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr;
 
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.DetailsOfReceivablesAndUncollectedItemsJRVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRQuery;
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * Project: anrui-fin(销售相关) <br/>
- * File: FinUncollectedReceivablesDetailedFeignFallback.java <br/>
- * Class: com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest <br/>
- * Description: 应收未收款项明细表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "金融认款应收未收款项明细表")
-@RestController("com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRRest")
+@RestController
 @RequestMapping("/finuncollectedreceivablesdetailedjr")
 public class FinUncollectedReceivablesDetailedJRRest implements FinUncollectedReceivablesDetailedJRFeign {
 
@@ -98,4 +81,9 @@ public class FinUncollectedReceivablesDetailedJRRest implements FinUncollectedRe
     public ResultBean<FinUncollectedReceivablesDetailedJR> getUnJrByPayCostTitleKeyAndBusSid(String key, String busSid) {
         return finUncollectedReceivablesDetailedJRService.getUnJrByPayCostTitleKeyAndBusSid(key,busSid);
     }
+
+    @Override
+    public ResultBean<List<FinUncollectedReceivablesDetailedJR>> selByBusSid(List<String> busSids) {
+        return finUncollectedReceivablesDetailedJRService.selByBusSid(busSids);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java

@@ -198,4 +198,10 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi
         FinUncollectedReceivablesDetailedJR jr = baseMapper.getUnJrByPayCostTitleKeyAndBusSid(key,busSid);
         return rb.success().setData(jr);
     }
+
+    public ResultBean<List<FinUncollectedReceivablesDetailedJR>> selByBusSid(List<String> busSids) {
+        ResultBean rb = ResultBean.fireFail();
+        List<FinUncollectedReceivablesDetailedJR> jr = baseMapper.selByBusSid(busSids);
+        return rb.success().setData(jr);
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDto.java

@@ -78,4 +78,6 @@ public class LoanSettleApplyDto {
     private String bankSid;
     private String busSid;
 
+    private boolean showHg;
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java

@@ -140,4 +140,11 @@ public class SettleApplyAppVo {
     private String notDuePriceRelief;
     @ApiModelProperty("减免依据")
     private String reliefBasis;
+
+    @ApiModelProperty("回购后还款金额")
+    private String buyBackMoney;
+    @ApiModelProperty("当前公司结清合计")
+    private String settleAll2;
+    @ApiModelProperty("备注")
+    private String remarks;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java

@@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.*;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVeh;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehVo;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -75,4 +76,6 @@ public interface LoanBePadsincereVehMapper extends BaseMapper<LoanBePadsincereVe
 
     @Select("select *,saleVehSid AS busVinSid from loan_be_padsincere_veh where mainSid = #{applySid} and bankContractNo = #{busSid}")
     List<LoanBePadsincereVehDetailsVo> selByBankCont(@Param("applySid") String applySid, @Param("busSid") String busSid);
+
+    BigDecimal selByBusVinSid(String busVinSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.xml

@@ -19,4 +19,12 @@
         where mainSid = #{sid}
           and paySid = #{paySid}
     </select>
+
+    <select id="selByBusVinSid" resultType="java.math.BigDecimal">
+        SELECT
+            IF(SUM(padMoney), SUM(padMoney), 0)
+        FROM
+            loan_be_padsincere_veh
+        WHERE saleVehSid = #{busVinSid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java

@@ -43,6 +43,7 @@ import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehFeign
 
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -114,4 +115,8 @@ public class LoanBePadsincereVehService extends MybatisBaseService<LoanBePadsinc
     public List<LoanBePadsincereVehDetailsVo> selByBankCont(String applySid, String busSid) {
         return baseMapper.selByBankCont(applySid, busSid);
     }
+
+    public BigDecimal selByBusVinSid(String busVinSid) {
+        return baseMapper.selByBusVinSid(busVinSid);
+    }
 }

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

@@ -43,7 +43,13 @@ import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderRetu
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehPdfVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
@@ -67,6 +73,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
 import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
@@ -78,6 +85,7 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesnotapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesNotVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesNotVehDto;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
+import com.yxt.anrui.riskcenter.biz.loanbepadsincereveh.LoanBePadsincereVehService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
@@ -166,6 +174,12 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
     private LoanRepurchaseApplyService loanRepurchaseApplyService;
     @Autowired
     private LoanRepurchaseCostService loanRepurchaseCostService;
+    @Autowired
+    private FinUncollectedReceivablesDetailedJRFeign finUncollectedReceivablesDetailedJRFeign;
+    @Autowired
+    private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
+    @Autowired
+    private LoanBePadsincereVehService loanBePadsincereVehService;
 
     public PagerVo<LoanSecondarySalesNotApplyVo> listPageVo(PagerQuery<LoanSecondarySalesNotApplyQuery> pq) {
         LoanSecondarySalesNotApplyQuery query = pq.getParams();
@@ -579,7 +593,8 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-
+                //认损应收
+                pushRiskToFin3(businessSid);
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
@@ -622,6 +637,74 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
         }
     }
 
+    private void pushRiskToFin3(String businessSid) {
+        LoanSecondarySalesNotApply loanSecondarySalesNotApply = fetchBySid(businessSid);
+        //不追偿车辆列表
+        List<LoanSecondarySalesNotVehDetailsVo> loanSecondarySalesNotVehDetailsVos = loanSecondarySalesNotVehService.selByMainSid(businessSid);
+        for (LoanSecondarySalesNotVehDetailsVo loanSecondarySalesNotVehDetailsVo : loanSecondarySalesNotVehDetailsVos) {
+            //查询车辆还款计划明细
+            List<LoanRepaymentPlanDetails> loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.selectByBusVinSid(loanSecondarySalesNotVehDetailsVo.getBusVinSid());
+            //查询车辆是否有垫款金额
+            BigDecimal dkje = loanBePadsincereVehService.selByBusVinSid(loanSecondarySalesNotVehDetailsVo.getBusVinSid());
+            //获取明细sid集合
+            List<String> jhmxSids = loanRepaymentPlanDetails.stream().map(c -> c.getSid()).
+                    collect(Collectors.toList());
+            //查询金融应收所有应收款
+            List<FinUncollectedReceivablesDetailedJR> data = finUncollectedReceivablesDetailedJRFeign.selByBusSid(jhmxSids).getData();
+            if (!data.isEmpty()){
+                for (FinUncollectedReceivablesDetailedJR datum : data) {
+                    List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetaileds = finSelectedReceivablesDetailedFeign.fetchByReceivablesSid(datum.getSid()).getData();
+                    if (finSelectedReceivablesDetaileds.isEmpty()){
+                        List<FinSelectedReceivablesDetailed> selectList = new ArrayList<>();
+                        FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                        fin.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
+                        fin.setRemarks("认损");
+                        fin.setVIN(loanSecondarySalesNotVehDetailsVo.getVinNo());
+                        fin.setUseOrgSid(loanSecondarySalesNotApply.getUseOrgSid());
+                        fin.setReceivablesName(datum.getPayCostTitleValue());
+                        fin.setSubscriptionMoney(datum.getReveivableMoney());
+                        fin.setSubscriptionDate(DateUtil.today());
+                        fin.setAuditState(3);
+                        fin.setAuditDate(DateUtil.today());
+                        fin.setReceivablesSid(datum.getSid());
+                        fin.setKxState("01");
+                        fin.setPurchaseSystemSid("");
+                        fin.setPurchaseSystemName("");
+                        fin.setStaffUserSid("");
+                        fin.setUseOrgName(loanSecondarySalesNotApply.getUseOrgName());
+                        fin.setOrgSidPath(loanSecondarySalesNotApply.getOrgSidPath());
+                        selectList.add(fin);
+                        finSelectedReceivablesDetailedFeign.saveAll(selectList);
+                    }else {
+                        BigDecimal ys = finSelectedReceivablesDetaileds.stream().map(FinSelectedReceivablesDetailed::getSubscriptionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+                        if (ys.compareTo(datum.getReveivableMoney()) == -1){
+                            List<FinSelectedReceivablesDetailed> selectList = new ArrayList<>();
+                            FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                            fin.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
+                            fin.setRemarks("认损");
+                            fin.setVIN(loanSecondarySalesNotVehDetailsVo.getVinNo());
+                            fin.setUseOrgSid(loanSecondarySalesNotApply.getUseOrgSid());
+                            fin.setReceivablesName(datum.getPayCostTitleValue());
+                            fin.setSubscriptionMoney(datum.getReveivableMoney().subtract(ys));
+                            fin.setSubscriptionDate(DateUtil.today());
+                            fin.setAuditState(3);
+                            fin.setAuditDate(DateUtil.today());
+                            fin.setReceivablesSid(datum.getSid());
+                            fin.setKxState("01");
+                            fin.setPurchaseSystemSid("");
+                            fin.setPurchaseSystemName("");
+                            fin.setStaffUserSid("");
+                            fin.setUseOrgName(loanSecondarySalesNotApply.getUseOrgName());
+                            fin.setOrgSidPath(loanSecondarySalesNotApply.getOrgSidPath());
+                            selectList.add(fin);
+                            finSelectedReceivablesDetailedFeign.saveAll(selectList);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     private void pushRiskToFin2(LoanSecondarySalesNotApply loanSecondarySalesNotApply, List<String> busVinSidList) {
         LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostService.selectMainSu(loanSecondarySalesNotApply.getSecSaleSid());
         Voucher voucher = new Voucher();

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

@@ -362,6 +362,13 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             }
             LoanSettleCompanyReductionVo loanSettleCompanyReductionVo = dto.getLoanSettleCompanyReductionVo();
             if (loanSettleCompanyReductionVo != null) {
+                if(!dto.isTrueReduction()){
+                    if (dto.isShowHg()) {//回购结清
+                        loanSettleCompanyReductionVo.setAmountTo(loanSettleCompanyCostVo.getSettleAll2());
+                    }else{
+                        loanSettleCompanyReductionVo.setAmountTo(loanSettleCompanyCostVo.getSettleAll());
+                    }
+                }
                 loanSettleCompanyReductionService.saveReduction(sid, loanSettleCompanyReductionVo);
             }
             if (StringUtils.isNotBlank(dto.getBusSid())) {
@@ -400,6 +407,13 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 loanSettleCompanyReductionVo.setFundPenalty("");
             }
             if (loanSettleCompanyReductionVo != null) {
+                if(!dto.isTrueReduction()){
+                    if (dto.isShowHg()) {//回购结清
+                        loanSettleCompanyReductionVo.setAmountTo(loanSettleCompanyCostVo.getSettleAll2());
+                    }else{
+                        loanSettleCompanyReductionVo.setAmountTo(loanSettleCompanyCostVo.getSettleAll());
+                    }
+                }
                 loanSettleCompanyReductionService.saveReduction(sid, loanSettleCompanyReductionVo);
             }
             baseMapper.updateById(loanSettleApply);
@@ -948,8 +962,15 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 } else {
                     LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(businessSid);
                     if (null != loanSettleCompanyCost) {
-                        if (null != loanSettleCompanyCost.getSettleAll()) {
-                            amountTo = loanSettleCompanyCost.getSettleAll();
+                        if(StringUtils.isNotBlank(loanSettleApply.getBusSid())){//回购
+                            if(loanSettleCompanyCost.getSettleAll2() != null){
+                                amountTo = loanSettleCompanyCost.getSettleAll2();
+                            }
+
+                        }else{
+                            if (null != loanSettleCompanyCost.getSettleAll()) {
+                                amountTo = loanSettleCompanyCost.getSettleAll();
+                            }
                         }
                     }
                 }
@@ -3581,9 +3602,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             if (loanSettleCompanyCost.getSettleAll() != null) {
                 settleApplyAppVo.setSettleAll(loanSettleCompanyCost.getSettleAll().toString());
             }
-            if (loanSettleCompanyCost.getFundAll() != null) {
-                settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString());
-            }
             if (StringUtils.isNotBlank(loanSettleCompanyCost.getOtherCostRemarks())) {
                 settleApplyAppVo.setOtherCostRemarks(loanSettleCompanyCost.getOtherCostRemarks());
             }
@@ -3629,6 +3647,47 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         } else {
             settleApplyAppVo.setTrueHg(false);
         }
+        if(settleApplyAppVo.isTrueHg()){//是回购的话
+            //回购后的还款金额：回购申请中的（公司逾期月还+公司当前未还月还+公司未到期月还）-当前结清申请中的公司（公司逾期月还+公司当前未还月还+公司未到期月还）
+            BigDecimal overDueMonthPriceBack = new BigDecimal(0);
+            BigDecimal currentNotDuePriceBack = new BigDecimal(0);
+            BigDecimal notDuePriceBack = new BigDecimal(0);
+            BigDecimal amountBack = new BigDecimal(0);
+            if (null != loanSettleApply.getOverdueMonthPrice()) {
+                overDueMonthPriceBack = loanSettleApply.getOverdueMonthPrice();
+            }
+            if (null != loanSettleApply.getCurrentNotDuePrice()) {
+                currentNotDuePriceBack = loanSettleApply.getCurrentNotDuePrice();
+            }
+            if (null != loanSettleApply.getNotDuePrice()) {
+                notDuePriceBack = loanSettleApply.getNotDuePrice();
+            }
+            amountBack = overDueMonthPriceBack.add(currentNotDuePriceBack).add(notDuePriceBack);
+            BigDecimal overDueMonthPrice = new BigDecimal(0); //回购申请中正常合计
+            BigDecimal currentNotDuePrice = new BigDecimal(0); //回购金额
+            BigDecimal notDuePrice = new BigDecimal(0); //回购金额
+            BigDecimal amount = new BigDecimal(0);
+            SettleApplyCommonVo settleApplyCommonVo = getInfo(loanSettleApply.getBusVinSid(), loanSettleApply.getSettingDate());
+            if (null != settleApplyCommonVo) {
+                if (StringUtils.isNotBlank(settleApplyCommonVo.getOverdueMonthPrice())) {
+                    overDueMonthPrice = new BigDecimal(settleApplyCommonVo.getOverdueMonthPrice());
+                }
+                if (StringUtils.isNotBlank(settleApplyCommonVo.getCurrentNotDuePrice())) {
+                    currentNotDuePrice = new BigDecimal(settleApplyCommonVo.getCurrentNotDuePrice());
+                }
+                if (StringUtils.isNotBlank(settleApplyCommonVo.getNotDuePrice())) {
+                    notDuePrice = new BigDecimal(settleApplyCommonVo.getNotDuePrice());
+                }
+                amount = overDueMonthPrice.add(currentNotDuePrice).add(notDuePrice);
+            }
+            settleApplyAppVo.setBuyBackMoney((amountBack.subtract(amount)).toString());
+            if(loanSettleCompanyCost.getSettleAll2() != null){
+                settleApplyAppVo.setSettleAll2(loanSettleCompanyCost.getSettleAll2().toString());
+            }
+            if (loanSettleCompanyCost.getFundAll() != null) {
+                settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString());
+            }
+        }
 
         return rb.success().setData(settleApplyAppVo);
     }
@@ -3665,6 +3724,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 if (query.getType().equals("1")) {
                     qw.eq("bv.repoState", 0);
                 }
+            }else{
+                qw.eq("bv.repoState", 0);//0非回购
+                qw.eq("bv.riskState",0);//0正常
             }
             qw.eq("ld.repaymentState", 1);
             qw.orderBy(true, true, "ld.loanContractNo", "bv.linkNo");
@@ -3740,8 +3802,15 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         } else {
             LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(loanSettleApply.getSid());
             if (null != loanSettleCompanyCost) {
-                if (null != loanSettleCompanyCost.getSettleAll()) {
-                    amountTo = loanSettleCompanyCost.getSettleAll();
+                if(StringUtils.isNotBlank(loanSettleApply.getBusSid())){//回购
+                    if(loanSettleCompanyCost.getSettleAll2() != null){
+                        amountTo = loanSettleCompanyCost.getSettleAll2();
+                    }
+
+                }else{
+                    if (null != loanSettleCompanyCost.getSettleAll()) {
+                        amountTo = loanSettleCompanyCost.getSettleAll();
+                    }
                 }
             }
         }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java

@@ -144,6 +144,11 @@ public interface ScmVehRebateFeign {
     @ResponseBody
     public ResultBean<ScmVehRebateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("清空")
+    @GetMapping("/clear/{sid}")
+    @ResponseBody
+    public ResultBean<ScmVehRebateDetailsVo> clear(@PathVariable("sid") String sid);
+
     @PostMapping("/download")
     @ApiOperation(value = "下载模板")
     @ResponseBody

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

@@ -407,6 +407,13 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<ScmVehRebateDetailsVo> clear(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmVehRebateDetailsVo vo = scmVehRebateService.clear(sid);
+        return rb.success().setData(vo);
+    }
+
     @Override
     public void downloadExcel() {
         scmVehRebateService.downloadExcel();

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

@@ -2747,4 +2747,26 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         }
         return rb.success().setData(list);
     }
+
+    public ScmVehRebateDetailsVo clear(String sid) {
+        ScmVehRebate scmVehRebate = fetchBySid(sid);
+        scmVehRebate.setUploadDate("");
+        scmVehRebate.setUploadMoney(BigDecimal.ZERO);
+        scmVehRebate.setStayDetermineMoney(BigDecimal.ZERO);
+        scmVehRebate.setStayDetermineMoneyNew(BigDecimal.ZERO);
+        scmVehRebate.setOnceTreatCost(BigDecimal.ZERO);
+        scmVehRebate.setOnceSuppCost(BigDecimal.ZERO);
+        scmVehRebate.setOnceSuppRemark("");
+        scmVehRebate.setSecondaryUploadDate("");
+        scmVehRebate.setSecondaryUploadMoney(BigDecimal.ZERO);
+        scmVehRebate.setSecondTreatCost(BigDecimal.ZERO);
+        scmVehRebate.setSecondSuppCost(BigDecimal.ZERO);
+        scmVehRebate.setSecondSuppRemark("");
+        scmVehRebate.setIsAdjustment("");
+        scmVehRebate.setAdjustmentMoney(BigDecimal.ZERO);
+        scmVehRebate.setAdjustmentRemarks("");
+        updateById(scmVehRebate);
+        ScmVehRebateDetailsVo scmVehRebateDetailsVo = fetchDetailsVoBySid(sid);
+        return scmVehRebateDetailsVo;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyAppVos.java

@@ -143,4 +143,11 @@ public class SettleApplyAppVos {
     private String notDuePriceRelief;
     @ApiModelProperty("减免依据")
     private String reliefBasis;
+
+    @ApiModelProperty("回购后还款金额")
+    private String buyBackMoney;
+    @ApiModelProperty("当前公司结清合计")
+    private String settleAll2;
+    @ApiModelProperty("备注")
+    private String remarks;
 }