Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -289,6 +289,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             baseInternalPurchaseVehicle1.setRecallStateValue(VehicleState.RecallState.UN_RECALL.getRemarks());
             baseInternalPurchaseVehicle1.setIsAccadj("0");
             baseInternalPurchaseVehicle1.setIsInvoicing("0");
+            baseInternalPurchaseVehicle1.setInitialWitPinMoney(baseInternalPurchaseVehicle1.getWitPinMoney());
+            baseInternalPurchaseVehicle1.setCallInBuyerOrgSid(baseInternalPurchase.getCallInBuyerOrgSid());
+            baseInternalPurchaseVehicle1.setCallInBuyerOrgName(baseInternalPurchase.getCallInBuyerOrgName());
             baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
         }
         return rb.success().setMsg("修改成功").setData(dtoSid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java

@@ -43,21 +43,16 @@ import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedPdfVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
-import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
 import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.scm.api.scmapplyinboundquery.PdfPath;
-import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQuery;
 import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDetailsVo;
 import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
 import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo;
 import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryFeign;
-import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryMaterial;
 import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.TransformMoney;
@@ -77,9 +72,7 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Project: anrui-base(厂家退库) <br/>
@@ -444,7 +437,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
         dataMap.put("makeName", pdfVo.getMakeName());
         dataMap.put("confirmName", "");
         //获取模板
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/tkjg.ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/tkjg.ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -478,7 +471,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
         dataMap.put("makeName", pdfVo.getMakeName());
         dataMap.put("confirmName", "");
         //获取模板
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/tkzk.ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/tkzk.ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.commoncontract.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
@@ -106,4 +107,8 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
     IPage<ContractBusVechileDataHandoverVo> selectcontractVo(IPage<CommonContract> page, @Param(Constants.WRAPPER) Wrapper<CommonContract> qw);
 
     List<ContractBusVechileDataHandoverVo> selectcontractForHandover(@Param(Constants.WRAPPER) QueryWrapper<CommonContract> qw);
+
+    BusSalesOrder selectByBusSids(String busSid);
+
+    CommonContract selectByBusSidss(String busSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -271,4 +271,12 @@
                modelName as model
         FROM common_contract ${ew.customSqlSegment}
     </select>
+
+    <select id="selectByBusSids" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
+        select * from anrui_buscenter.bus_sales_order where sid = #{busSid}
+    </select>
+
+    <select id="selectByBusSidss" resultType="com.yxt.anrui.base.api.commoncontract.CommonContract">
+        select * from common_contract where busSid = #{busSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1,22 +1,21 @@
 package com.yxt.anrui.base.biz.commoncontract;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basedistributor.BaseDistributor;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.commoncontract.*;
 import com.yxt.anrui.base.api.commoncontract.flowable.*;
+import com.yxt.anrui.base.biz.basedistributor.BaseDistributorService;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
 import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
@@ -43,8 +42,6 @@ import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationFeign;
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover;
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverFeign;
-import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverQuery;
-import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverVo;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
 import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerFileDDto;
@@ -75,7 +72,6 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.config.DictCommonType;
-import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultVo;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuotationQuery;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
@@ -204,6 +200,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     private BusVehicleInformationFeign busVehicleInformationFeign;
     @Autowired
     private LoanTemplateFeign loanTemplateFeign;
+    @Autowired
+    private BaseDistributorService baseDistributorService;
 
 
     private QueryWrapper<CommonContract> createQueryWrapper(CommonContractQuery query) {
@@ -821,16 +819,51 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
         String remarks = "";
+        CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
+        if (commonContract != null) {
+            String date = DateUtil.format(commonContract.getCreateTime(), "yyyy-MM-dd");
+            List<String> dateString = Arrays.asList(date.split("-"));
+            String year = dateString.get(0);
+            String month = dateString.get(1);
+            String day = dateString.get(2);
+            map.put("year", year);
+            map.put("month", month);
+            map.put("day", day);
+        }
+        BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
+        if (busSalesOrder.getAffiliatedCompanyType() == 0) {
+            //根据挂靠公司sid查询信息
+            if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
+                BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid());
+                if (baseDistributor != null) {
+                    map.put("invoiceName", busSalesOrder.getAffiliatedCompany());//开票名称
+                    map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号
+                }
+            }
+            map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
+        }else{
+            if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
+
+            }
+        }
+        //组装到文档相对应的字段中
+        if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+            if (invoicingDetailsVoResultBean.getData() != null) {
+                map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+            }
+        }
         if ("现车".equals(appOrderDetailsVo.getOrderType())) {
             //获取模板
             ftl = "existingvehicles";
             if (stringList.size() > 0) {
-                remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList);
+//                remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList);
+                remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。";
             } else {
                 remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。";
             }
         } else {
-            map.put("dayOne", new BigDecimal(appOrderDetailsVo.getDepositInfo().getDeposit()).multiply(new BigDecimal(num)).toString());
+            map.put("dayOne", appOrderDetailsVo.getDepositInfo().getPayDepositDays());
             //获取模板
             ftl = "orderacar";
             remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。";
@@ -892,16 +925,47 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
         String remarks = "";
+        CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
+        if (commonContract != null) {
+            String date = DateUtil.format(commonContract.getCreateTime(), "yyyy-MM-dd");
+            List<String> dateString = Arrays.asList(date.split("-"));
+            String year = dateString.get(0);
+            String month = dateString.get(1);
+            String day = dateString.get(2);
+            map.put("year", year);
+            map.put("month", month);
+            map.put("day", day);
+        }
+        BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
+        if (busSalesOrder.getAffiliatedCompanyType() == 0) {
+            //根据挂靠公司sid查询信息
+            if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
+                BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid());
+                if (baseDistributor != null) {
+                    map.put("invoiceName", busSalesOrder.getAffiliatedCompany());//开票名称
+                    map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号
+                }
+            }
+            map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
+        }
+        //组装到文档相对应的字段中
+        if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+            if (invoicingDetailsVoResultBean.getData() != null) {
+                map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+            }
+        }
         if ("现车".equals(appOrderDetailsVo.getOrderType())) {
             //获取模板
             ftl = "existingvehicles";
             if (stringList.size() > 0) {
-                remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList);
+//                remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList);
+                remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。";
             } else {
                 remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。";
             }
         } else {
-            map.put("dayOne", new BigDecimal(appOrderDetailsVo.getDepositInfo().getDeposit()).multiply(new BigDecimal(num)).toString());
+            map.put("dayOne", appOrderDetailsVo.getDepositInfo().getPayDepositDays());
             //获取模板
             ftl = "orderacar";
             remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。";
@@ -972,7 +1036,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 remarks = "数量" + num + "台，单台成交价：        元。";
             }
             map.put("remarks", remarks);
-            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
+            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl");
             //生成word文件名
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1022,7 +1086,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 remarks = "数量" + num + "台，单台成交价：        元。";
             }
             map.put("remarks", remarks);
-            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
+            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl");
             //生成word文件名
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1051,7 +1115,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("vinNo", String.join(",", stringList));
         }*/
         String ftl = "receiveCar";
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1097,7 +1161,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         }
         map.put("invoicList", invoicMessageContractVos);
         String ftl = "invoicApply";
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1128,7 +1192,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         //查询销售订单的现车
         //车款：money,大写：moneyDx
         String ftl = "carFin";
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1152,7 +1216,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         //查询销售订单的现车
         //车款：money,大写：moneyDx
         String ftl = "moneyFin";
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1199,7 +1263,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("carLists", carContractListVos);
         }
         String ftl = "carContract";
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1696,13 +1760,13 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         }
         AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
         HomeKcCust homeKcCust = dto.getHomeKcCust();
-        if (homeKcCust != null){
+        if (homeKcCust != null) {
             map.put("createOrgName", homeKcCust.getAccCompName());
-        }else {
+        } else {
             map.put("createOrgName", dto.getCreateOrgName());
         }
         map.put("customerName", dto.getCustomerName());
-        map.put("contractNo",dto.getContractNo());
+        map.put("contractNo", dto.getContractNo());
         String carContract = getCarContract(dto, map, appOrderDetailsVo);
         return rb.success().setData(carContract);
     }
@@ -2022,16 +2086,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         }
         CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
         String idNo = crmCustomerTempVo.getIDNumber();
-        //身份证号
-        //生成合同时如果为个人时，证件证号全款不是必须的、贷款必须。企业的证件号码不必须。
-        /*if("2".equals(appOrderDetailsVo.getPayTypeKey())){
-            if("1".equals(crmCustomerTempVo.getCustomerTypeKey())){
-                if (StringUtils.isBlank(idNo)) {
-                    return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
-                }
-            }
-        }*/
-
         //查询销售订单的车型信息
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
         //根据车型sid查询车型的全称
@@ -2139,7 +2193,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         if (StringUtils.isNotBlank(baseModelConfig.getTireCover()) && !"-".equals(baseModelConfig.getTireCover())) {
             modelAllName.append("、").append(baseModelConfig.getTireCover());
         }
-//        modelAllName.append("<w:p></w:p>");
         StringBuilder modelAllName2 = new StringBuilder();
         modelAllName2.append("\t");
         //驾驶室
@@ -2277,7 +2330,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
                 ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
                 if (invoicingDetailsVoResultBean.getData() != null) {
-                    map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+//                    map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                     createOrgName = invoicingDetailsVoResultBean.getData().getName();
                 } else {
                     return rb.setMsg("请与出纳人员联系完善开票信息");
@@ -2285,14 +2338,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
         }
         map.put("modelConfigs", modelAllName2.toString());
-        map.put("customerName", customerName);
+       /* map.put("customerName", customerName);
         map.put("mobile", mobile);
-        map.put("idNo", idNo);
+        map.put("idNo", idNo);*/
         map.put("modelName", modelName);
         map.put("modelConfig", modelConfig);
-        if ("1".equals(appOrderDetailsVo.getIsInsurance())) {
-            map.put("insuranceInfo", insuranceInfo);
-        }
         map.put("totalPrice", totalPrice);
         map.put("priceRemarks", priceRemarks);
         if ("0".equals(depositTotal)) {
@@ -2337,7 +2387,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             Future<String> future1_2 = pool.submit(() -> {
                 return genCarSaleContract2(dto, map, appOrderDetailsVo);
             });
-            Future<String> future2 = pool.submit(() -> {
+            /*Future<String> future2 = pool.submit(() -> {
                 return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
             });
             Future<String> future2_2 = pool.submit(() -> {
@@ -2354,7 +2404,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 future8 = pool.submit(() -> {
                     return getCarContract(null, map, appOrderDetailsVo);
                 });
-            }
+            }*/
             List<File> filesList = new ArrayList<>();
             if (future1 != null) {
                 if (StringUtils.isNotBlank(future1.get())) {
@@ -2368,7 +2418,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     filesList.add(file);
                 }
             }
-            if (future2 != null) {
+               /*if (future2 != null) {
                 if (StringUtils.isNotBlank(future2.get())) {
                     File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get());
                     filesList.add(file);
@@ -2390,7 +2440,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             if (StringUtils.isNotBlank(future4.get())) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get());
                 filesList.add(file);
-            }
+            }*/
 
             if ("2".equals(appOrderDetailsVo.getPayTypeKey())) {
                 Future<String> future10 = pool.submit(() -> {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java

@@ -145,4 +145,6 @@ public class BusSalesOrder extends BaseEntity {
 
     @ApiModelProperty("若无值，则为现车中有车架号或其他两种类型的，若有值，则为现车中不确定车架号的数量")
     private String nowCarUnknownVinNum;
+    @ApiModelProperty("是否是挂靠公司")
+    private int affiliatedCompanyType;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@@ -31,10 +31,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * Project: anrui-fin(财务) <br/>
@@ -97,4 +94,9 @@ public interface FinPaymentrecordFeign {
     @PostMapping("/updateAllState")
     @ResponseBody
     ResultBean updateAllState(@RequestBody FinPaymentDto dto);
+
+    @ApiOperation("根据sid获取数据")
+    @GetMapping("/fetchBySid")
+    @ResponseBody
+    ResultBean<FinPaymentrecord> fetchBySid(@RequestParam("sid") String sid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java

@@ -90,4 +90,9 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
     public ResultBean updateAllState(FinPaymentDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<FinPaymentrecord> fetchBySid(String sid) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java

@@ -101,4 +101,11 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
     public ResultBean updateAllState(FinPaymentDto dto) {
         return finPaymentrecordService.updateAllState(dto);
     }
+
+    @Override
+    public ResultBean<FinPaymentrecord> fetchBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinPaymentrecord finPaymentrecord = finPaymentrecordService.fetchBySid(sid);
+        return rb.success().setData(finPaymentrecord);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -64,6 +64,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -341,20 +342,22 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
-                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
+                if (voucherDetail.getAmount().compareTo(BigDecimal.ZERO) > 0) {
-                Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
+                    Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
-                dto1.setSummary("本金转累欠");
+                    Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
-                dto2.setSummary("本金转累欠");
+                    dto1.setSummary("本金转累欠");
-                dto1.setSubjectNo("1201.02.03");
+                    dto2.setSummary("本金转累欠");
-                dto2.setSubjectNo("1201.02.01");
+                    dto1.setSubjectNo("1201.02.03");
-                dto1.setDimensionDept(voucherDetail.getDeptCode());
+                    dto2.setSubjectNo("1201.02.01");
-                dto1.setDimensionCustom(voucherDetail.getCustomerCode());
+                    dto1.setDimensionDept(voucherDetail.getDeptCode());
-                dto2.setDimensionDept(voucherDetail.getDeptCode());
+                    dto1.setDimensionCustom(voucherDetail.getCustomerCode());
-                dto2.setDimensionCustom(voucherDetail.getCustomerCode());
+                    dto2.setDimensionDept(voucherDetail.getDeptCode());
-                dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
+                    dto2.setDimensionCustom(voucherDetail.getCustomerCode());
-                dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
+                    dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                resultDetails.add(dto1);
+                    dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
-                resultDetails.add(dto2);
+                    resultDetails.add(dto1);
+                    resultDetails.add(dto2);
+                }
             }
             newVoucher.setResultDetails(resultDetails);
         }
@@ -385,7 +388,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                 Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                 dto1.setSummary(voucherDetail.getBankName() + "划扣");
                 dto2.setSummary(voucherDetail.getBankName() + "划扣");
-                if (voucherDetail.getSceneCode().equals(SceneCodeEnum.BUCKLE_VOUCHER1)) {
+                if (voucherDetail.getSceneCode().equals(SceneCodeEnum.BUCKLE_VOUCHER1.getCode())) {
                     //正常月还
                     DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(voucherDetail.getBankName(), "investorsCode").getData();
                     if (null != dictCommonVo) {
@@ -393,7 +396,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                     }
                     dto2.setSubjectNo("1201.02.01");
                 }
-                if (voucherDetail.getSceneCode().equals(SceneCodeEnum.BUCKLE_VOUCHER2)) {
+                if (voucherDetail.getSceneCode().equals(SceneCodeEnum.BUCKLE_VOUCHER2.getCode())) {
                     //逾期未垫款
                     DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(voucherDetail.getBankName(), "investorsCode").getData();
                     if (null != dictCommonVo) {
@@ -401,7 +404,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                     }
                     dto2.setSubjectNo("1201.02.03");
                 }
-                if (voucherDetail.getSceneCode().equals(SceneCodeEnum.BUCKLE_VOUCHER3)) {
+                if (voucherDetail.getSceneCode().equals(SceneCodeEnum.BUCKLE_VOUCHER3.getCode())) {
                     //逾期已垫款
                     dto1.setSubjectNo("1133.10.20");
                     dto2.setSubjectNo("1201.02.03");
@@ -417,7 +420,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
             }
             newVoucher.setResultDetails(resultDetails);
         }
-        //  log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
+        log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
         return voucherService.saveVoucher(newVoucher);
     }
 
@@ -527,7 +530,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
             }
             newVoucher.setResultDetails(resultDetails);
         }
-        //  log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
+          log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
         return voucherService.saveVoucher(newVoucher);
     }
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java

@@ -8,8 +8,8 @@ package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile;
 public enum LoanAttachTypeEnum {
 
     DWXX("001", "定位信息"),
-    FWZP("002", "房屋照片"),
+    FWZP("002", "小区/村口照片"),
-    MKZP("003", "门口照片"),
+    MKZP("003", "住所照片"),
     KTWSZP("004", "客厅卧室照片"),
     HYZD("005", "合影照等"),
     DKRSFZ("006", "贷款人身份证"),

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

@@ -84,5 +84,6 @@ public class LoanSettleApplyDetailsVo {
     private String busSid;
     @ApiModelProperty("是否展示回购字段")
     private boolean showHg;
-
+    @ApiModelProperty("回购后还款金额")
+    private String buyBackMoney;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -45,6 +45,7 @@ import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeign;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyDto;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyFeign;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecord;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -1101,13 +1102,14 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
     public ResultBean pushAdvancesVoucher(String sid, String paySid) {
         ResultBean rb = ResultBean.fireFail();
         List<LoanBePadsincereVeh> records = loanBePadsincereVehService.selByMainSidAndPaySid(sid, paySid);
+        FinPaymentrecord paymentrecord = finPaymentrecordFeign.fetchBySid(paySid).getData();
         if (!records.isEmpty()) {
             PaymentVoucher paymentVoucher = new PaymentVoucher();
             List<PaymentVoucher.PaymentVoucherDetail> voucherDetails = new ArrayList<>();
             LoanBePadsincereVeh l = records.get(0);
             if (null != l) {
-                String accountNumber = l.getBankCollectionNum();
+                String accountNumber = paymentrecord.getPayBankAccount();
-                paymentVoucher.setBankAccount(l.getBankCollectionNum());
+                paymentVoucher.setBankAccount(paymentrecord.getPayBankAccount());
                 String mainSid = l.getMainSid();
                 LoanBePadsincereApply loanBePadsincereApply = fetchBySid(mainSid);
                 FinManufacturerBank manufacturerBank = finManufacturerBankFeign.selOneByBankNo(accountNumber, loanBePadsincereApply.getUseOrgSid()).getData();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -538,9 +538,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomeVisitInvestigateInitInformationStateVo loanHomeVisitInvestigateInitInformationStateVo = new LoanHomeVisitInvestigateInitInformationStateVo();
         //定位信息
         List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
-        //房屋照片
+        //小区/村口照片
         List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType());
-        //门口照片
+        //住所照片
         List<LoanHomevisitInvestigateFileDetailsVo> mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType());
         //客厅卧室照片
         List<LoanHomevisitInvestigateFileDetailsVo> ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType());
@@ -577,8 +577,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
         } else if (mkzpImages == null || mkzpImages.size() == 0) {
             loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
-        } else if (ktwszpImages == null || ktwszpImages.size() == 0) {
-            loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
         } else if (hyzdImages == null || hyzdImages.size() == 0) {
             loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
         } else {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -27,6 +27,7 @@ import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -88,6 +89,8 @@ import java.util.stream.Collectors;
 @Service
 public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymentHistoryMapper, LoanRepaymentHistory> {
 
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
     @Autowired
@@ -670,7 +673,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
      * @param orgPath
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
     public ResultBean updateState(String orgPath) {
         ResultBean rb = ResultBean.fireFail();
         QueryWrapper<LoanRepaymentHistory> qw = new QueryWrapper<>();
@@ -683,11 +685,15 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         int i3 = orgSidPath.indexOf("/", i2 + 1);
         int i4 = orgSidPath.indexOf("/", i3 + 1);
         orgSidPath = orgSidPath.substring(0, i3);
-        String pushUseOrgSid = orgSidPath;
+        String pushUseOrgSid = "";
         qw.like("p.orgSidPath", orgSidPath);
         qw.ne("h.buckleKey", "002");
         qw.ne("h.buckleKey", "003");
         qw.eq("h.updateState", "0");
+        ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
+        if (orgSidByPath.getSuccess()) {
+            pushUseOrgSid = orgSidByPath.getData();
+        }
         List<String> histories = baseMapper.selUpdateStateList(qw);
         HashSet<String> bankContractNos = new HashSet<>();
         HashSet<String> pSids = new HashSet<>();
@@ -785,6 +791,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                     }
                 }
             }
+            pushLateVoucher(pushUseOrgSid);
 //            try {
 //                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
 //                        .setNameFormat("demo-pool-%d").build();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -43,19 +43,27 @@
     </select>
 
     <select id="selBeMoney" resultType="java.lang.String">
-        SELECT (
+        SELECT
-                   lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
+                (
-                   ) AS yq_total
+                        a.yq_total - IFNULL(a.actualMoney, 0)
-        FROM `loan_repayment_plan_details` lrpd
+                        ) AS yq_total
-                 LEFT JOIN `loan_repayment_history` lrh
+        FROM
-                           ON lrh.planDetailSid = lrpd.`sid`
+                (SELECT
-        WHERE lrpd.vinNo = #{no}
+                         lrpd.`dueMoney` AS yq_total,
-          AND lrpd.period = #{period}
+                         (SELECT
-          AND lrpd.bankContractNo = #{bankContractNo}
+                                  SUM(IFNULL(lrh.actualMoney, 0))
-          AND DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
+                          FROM
-          AND lrh.`updateState` = '1'
+                                  loan_repayment_history lrh
-        GROUP BY lrpd.`sid`
+                          WHERE lrh.planDetailSid = lrpd.`sid`
-        HAVING (yq_total > 0)
+                            AND lrh.`updateState` = '1') AS actualMoney
+                 FROM
+                         `loan_repayment_plan_details` lrpd
+                 WHERE lrpd.vinNo = #{no}
+                   AND lrpd.period = #{period}
+                   AND lrpd.bankContractNo = #{bankContractNo}
+                   AND DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
+                 GROUP BY lrpd.`sid`
+                 HAVING (yq_total > 0)) a
     </select>
 
     <select id="details" resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayDetails">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml

@@ -182,6 +182,7 @@
           AND
             nodeState != '待提交'
 	    and nodeState != '终止'
+        and nodeState != '发起申请'
     </select>
     <select id="selFundAllByBusVinSid" resultType="java.lang.String">
         SELECT

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

@@ -52,6 +52,7 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
+import feign.FeignException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -190,7 +191,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
         qw.apply(StringUtils.isNotEmpty(applyStartTime), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(applyEndTime), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndTime + "','%Y-%m-%d')"
                 );
-        String closingStartDate = pagerQuery.getCloseEndDate();
+        String closingStartDate = pagerQuery.getCloseStartDate();
         String closingEndDate = pagerQuery.getCloseEndDate();
         qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (closeDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(closingEndDate), "date_format (closeDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
@@ -944,8 +945,8 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
         String sid = query.getSid();
         String orgPath = query.getOrgPath();
         String userSid = query.getUserSid();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         LoanRepurchaseApply loanRepurchaseApply = fetchBySid(sid);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         if (null != loanRepurchaseApply) {
             String busVinSid = loanRepurchaseApply.getBusVinSid();
             //根据用户查询发起人、发起部门、发起日期为当前日期
@@ -982,6 +983,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             loanSettleApplyDetailsVo.setUserSid(query.getUserSid());
             loanSettleApplyDetailsVo.setUseOrgSid(useOrgSid);
             loanSettleApplyDetailsVo.setSettingDate(DateUtil.today());
+            loanSettleApplyDetailsVo.setSettingDateBe(sdf.format(loanRepurchaseApply.getPrepareDate()));
             loanSettleApplyDetailsVo.setBusVinSid(loanRepurchaseApply.getBusVinSid());
             loanSettleApplyDetailsVo.setSaleOrderSid(loanRepurchaseApply.getSalesOrderSid());
             if (StringUtils.isNotBlank(loanRepurchaseApply.getVinNo())) {
@@ -1047,17 +1049,41 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             if (StringUtils.isNotBlank(fundAll)) {
                 loanSettleCompanyCostVo.setFundAll(fundAll);
             }
-            BigDecimal settleAll = new BigDecimal(0); //回购申请中正常合计
+//            回购后的还款金额：回购申请中的（公司逾期月还+公司当前未还月还+公司未到期月还）-当前结清申请中的公司（公司逾期月还+公司当前未还月还+公司未到期月还）
-            BigDecimal amount = new BigDecimal(0); //回购金额
+            BigDecimal overDueMonthPriceBack = new BigDecimal(0);
-            if (StringUtils.isNotBlank(companyCostVo.getSettleAll())) {
+            BigDecimal currentNotDuePriceBack = new BigDecimal(0);
-                settleAll = new BigDecimal(companyCostVo.getSettleAll());
+            BigDecimal notDuePriceBack = new BigDecimal(0);
+            BigDecimal amountBack = new BigDecimal(0);
+            if (null != loanRepurchaseApply.getOverdueMonthPrice()) {
+                overDueMonthPriceBack = loanRepurchaseApply.getOverdueMonthPrice();
+            }
+            if (null != loanRepurchaseApply.getCurrentNotDuePrice()) {
+                currentNotDuePriceBack = loanRepurchaseApply.getCurrentNotDuePrice();
+            }
+            if (null != loanRepurchaseApply.getNotDuePrice()) {
+                notDuePriceBack = loanRepurchaseApply.getNotDuePrice();
             }
-            if (null != loanRepurchaseApply.getAmount()) {
+            amountBack = overDueMonthPriceBack.add(currentNotDuePriceBack).add(notDuePriceBack);
-                amount = loanRepurchaseApply.getAmount();
+            BigDecimal overDueMonthPrice = new BigDecimal(0); //回购申请中正常合计
+            BigDecimal currentNotDuePrice = new BigDecimal(0); //回购金额
+            BigDecimal notDuePrice = new BigDecimal(0); //回购金额
+            BigDecimal amount = new BigDecimal(0);
+            SettleApplyCommonVo settleApplyCommonVo = loanSettleApplyService.getInfo(busVinSid, DateUtil.today());
+            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);
             }
-            loanSettleCompanyCostVo.setSettleAll((settleAll.subtract(amount)).toString());
+            loanSettleApplyDetailsVo.setBuyBackMoney((amountBack.subtract(amount)).toString());
             loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo);
-            loanSettleApplyDetailsVo.setTrueReduction(true);
+            loanSettleApplyDetailsVo.setShowHg(true);
             loanSettleApplyDetailsVo.setBusSid(sid);
         }
         return rb.success().setData(loanSettleApplyDetailsVo);

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

@@ -389,10 +389,50 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
                 loanSettleApplyDetailsVo.setShowHg(true);
             }
+            if(loanSettleApplyDetailsVo.isShowHg()){
+                loanSettleApplyDetailsVo = getInit(loanSettleApplyDetailsVo,loanSettleApply);
+            }
         }
         return rb.success().setData(loanSettleApplyDetailsVo);
     }
 
+    private LoanSettleApplyDetailsVo getInit(LoanSettleApplyDetailsVo loanSettleApplyDetailsVo, LoanSettleApply loanSettleApply) {
+        //回购后的还款金额：回购申请中的（公司逾期月还+公司当前未还月还+公司未到期月还）-当前结清申请中的公司（公司逾期月还+公司当前未还月还+公司未到期月还）
+        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);
+        }
+        loanSettleApplyDetailsVo.setBuyBackMoney((amountBack.subtract(amount)).toString());
+        return loanSettleApplyDetailsVo;
+    }
+
     public SettleApplyCommonVo getInfo(String busVinSid, String settingDate) {
         SettleApplyCommonVo settleApplyCommonVo = new SettleApplyCommonVo();
         //根据busVinSid查询还款计划表中数据

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@@ -20,6 +20,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
 import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeign;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecord;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -831,6 +832,7 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
     public ResultBean pushPaymentVoucher(String sid, String paySid) {
         ResultBean rb = ResultBean.fireFail();
         List<LoanTransferPaymentRecord> records = loanTransferPaymentRecordService.selByMainSidAndPaySid(sid, paySid);
+        FinPaymentrecord paymentrecord = finPaymentrecordFeign.fetchBySid(paySid).getData();
         if (!records.isEmpty()) {
             PaymentVoucher paymentVoucher = new PaymentVoucher();
             List<PaymentVoucher.PaymentVoucherDetail> voucherDetails = new ArrayList<>();
@@ -859,9 +861,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                         if (null != organizationVo) {
                             paymentVoucher.setUseOrgCode(organizationVo.getOrgCode());
                         }
-                        if (StringUtils.isNotBlank(v.getAccountNumber())) {
+                        if (StringUtils.isNotBlank(paymentrecord.getPayBankAccount())) {
-                            String accountNumber = v.getAccountNumber();
+                            String accountNumber = paymentrecord.getPayBankAccount();
-                            paymentVoucher.setBankAccount(v.getAccountNumber());
+                            paymentVoucher.setBankAccount(paymentrecord.getPayBankAccount());
                             FinManufacturerBank manufacturerBank = finManufacturerBankFeign.selOneByBankNo(accountNumber, useOrgSid).getData();
                             if (null != manufacturerBank) {
                                 paymentVoucher.setPayTypeCode(manufacturerBank.getDueBankKey());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/vehclearance/VehClearanceFeign.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
  * @Date
  * @Description
  */
-@Api(tags = "逾期垫款催收")
+@Api(tags = "车辆远程解控")
 @FeignClient(
         contextId = "terminal-VehClearance",
         name = "anrui-terminal",