Merge remote-tracking branch 'origin/master'

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

@@ -521,8 +521,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                     ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
                     scmEntryVehicleExamineDto.setBusinessSid(booad.getSid());
                     //发动机号
-                    BaseVehicle baseVehicle1 = baseVehicleService.selVehicleByVinNoAndOrgSid(booad.getVinNo(), baseInternalPurchase.getSellerOrgSid());
+                    BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(booad.getVinNo(), baseInternalPurchase.getSellerOrgSid());
-                    scmEntryVehicleExamineDto.setEngineNo(baseVehicle1.getEngineNo());
+                    scmEntryVehicleExamineDto.setEngineNo(baseVehicle.getEngineNo());
+                    //厂家入库日期
+                    scmEntryVehicleExamineDto.setInboundDate(DateUtil.formatDate(baseVehicle.getPriceDate()));
                     //配置的名称
                     scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
                     scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid());
@@ -538,10 +540,6 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                     scmEntryVehicleExamineDto.setVinNo(booad.getVinNo());
                     scmEntryVehicleExamineDto.setInspectionResult("1");
                     scmEntryVehicleExamineDto.setPrice("");
-                    //根据车架号查询厂家入库日期
-                    String vinNo = booad.getVinNo();
-                    BaseVehicleVo data = baseVehicleService.selVehicleByVinNo(vinNo).getData();
-                    scmEntryVehicleExamineDto.setInboundDate(DateUtil.formatDate(data.getPriceDate()));
                     ResultBean<String> resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
                     if (!resultBean1.getSuccess()) {
                         return rb.setMsg("验车业务模块的数据推送失败!");
@@ -569,14 +567,12 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                         String buyerOrgSid = baseInternalPurchase.getBuyerOrgSid();
                         BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigService.selectVehPur(vehicleSid, configSid, buyerOrgSid);
                         if (baseVehmodelVo == null) {
-                            BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(booad.getVinNo(), baseInternalPurchase.getSellerOrgSid());
-                            String insideCode = baseVehicle.getInsideCode();
                             BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig();
                             baseVehmodelConfig.setModelSid(vehicleSid);
                             baseVehmodelConfig.setConfigurationItemsSid(configSid);
                             baseVehmodelConfig.setUseOrgSid(buyerOrgSid);
                             baseVehmodelConfig.setGuidedPrice(new BigDecimal(booad.getGuidedPrice()));
-                            baseVehmodelConfig.setInsideCode(insideCode);
+                            baseVehmodelConfig.setInsideCode(baseVehicle.getInsideCode());
                             baseVehmodelConfigService.save(baseVehmodelConfig);
                         }
                     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java

@@ -87,6 +87,7 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.stream.Collectors;
 
 @Service
 public class BusBillApplicationService extends MybatisBaseService<BusBillApplicationMapper, BusBillApplication> {
@@ -144,11 +145,9 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
             BeanUtil.copyProperties(dto, busBillApplication, "sid");
             busBillApplication.setNum(busBillVehicles.size());
             busBillApplication.setArrearsMoney("0");
-            String fileUrl = getFileUrl(dto);
+            dto.setSid(busBillApplication.getSid());
-            if(StringUtils.isNotBlank(fileUrl)){
-                busBillApplication.setFileUrl(fileUrl);
-            }
             save(busBillApplication);
+            createContractNo(dto);
             //主车开票信息
             for (BusBillVehicleDto busBillVehicleDto : busBillVehicles) {
                 BusBillVehicle busBillVehicle = new BusBillVehicle();
@@ -210,6 +209,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         }
         dto.setArrearsMoney("0");
         updateByDto(dto);
+        createContractNo(dto);
         busBillFileService.deleteByBusAppSid(dtoSid);
         //附件信息
         if (carBuyContractImages != null) {
@@ -283,10 +283,6 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         }
         BusBillApplication entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
-        String fileUrl = getFileUrl(dto);
-        if(StringUtils.isNotBlank(fileUrl)){
-            entity.setFileUrl(fileUrl);
-        }
         baseMapper.updateById(entity);
     }
 
@@ -533,7 +529,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
     }
 
 
-    public String getFileUrl(BusBillApplicationDto dto) {
+    /*public String getFileUrl(BusBillApplicationDto dto) {
         Map<String, Object> map = new HashMap<>();
         Map<String, Object> carMap = new HashMap<>();
         Map<String, Object> filemap = new HashMap<>();
@@ -782,7 +778,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         }
 
         return fileUrl;
-    }
+    }*/
 
     public String blackFile(Map<String, Object> map) {
         String ftl = "dai_existingvehicles_black";
@@ -843,4 +839,257 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }
+
+    public String getFileUrl(BusBillApplicationDto dto) {
+        String fileUrl = "";
+        String contractNo = dto.getContractNo();
+        List<File> filesList = new ArrayList<>();
+        //根据合同号查询销售订单数据
+        BusSalesOrder busSalesOrder = baseMapper.selectByContract(contractNo);
+        SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
+        if ("1".equals(busSalesOrder.getPayTypeKey()) || ("2".equals(busSalesOrder.getPayTypeKey()) && StringUtils.isNotBlank(loanSolutions.getTypeKey()))) {
+            List<BusBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
+            BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
+            BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
+            //按开票名称sid分组
+            Map<String, List<BusBillVehicleDto>> groupedByOpenTickSid = finBillVehicles.stream()
+                    .collect(Collectors.groupingBy(BusBillVehicleDto::getOpenTickSid));
+            //遍历分组并组装每组的数据
+            groupedByOpenTickSid.forEach((openTickSid, sameOpenTickSidList) -> {
+                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> carMap = new HashMap<>();
+                Map<String, Object> filemap = new HashMap<>();
+                Map<String, Object> checkMap = new HashMap<>();
+                FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(openTickSid).getData();
+                if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) {
+                    BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
+                    //生成开票申请书
+                    if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                        ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                        if (invoicingDetailsVoResultBean.getData() != null) {
+                            map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                        }
+                    }
+                    map.put("contractNo", busSalesOrder.getContractNo());
+                    List<BillFileVo> list = new ArrayList<>();
+
+                    BillFileVo billFileVo = new BillFileVo();
+                    if (busSalesOrderModel != null) {
+                        billFileVo.setCarName(busSalesOrderModel.getModelName());
+                        billFileVo.setNum(String.valueOf(sameOpenTickSidList.size()));
+                        billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+                    }
+                    if (loanSolutions != null) {
+                        if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) {
+                            billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount());
+                        }
+                    }
+                    billFileVo.setType(finBillVehicleDto.getBillTypeValue());//开票类型
+                    list.add(billFileVo);
+
+                    List<BusBillTrailerDto> lllList = new ArrayList<>();
+                    sameOpenTickSidList.forEach(v -> {
+                        List<BusBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
+                        finBillTrailers.removeAll(Collections.singleton(null));
+                        finBillTrailers = finBillTrailers.stream().filter(vv -> vv.getVinNo().contains(v.getVinNo())).collect(Collectors.toList());
+                        lllList.addAll(finBillTrailers);
+                    });
+                    Map<String, Object> carNameMap = new HashMap<>();
+                    if (!lllList.isEmpty()) {
+                        for (int i = 0; i < lllList.size(); i++) {
+                            BusBillTrailerDto finBillTrailerDto = lllList.get(i);
+                            billFileVo = new BillFileVo();
+                            BaseTrailer baseTrailer = baseMapper.selectByTrailerNo(finBillTrailerDto.getGcVinNo());
+                            if (baseTrailer != null) {
+                                BaseTrailerModel baseTrailerModel = baseMapper.selectByModelSid(baseTrailer.getTrailerModelSid());
+                                if (baseTrailerModel != null) {
+                                    String carName = "外廓-" + Integer.parseInt(baseTrailerModel.getAppearanceSizeLong()) / 1000 + "米" + "\t" + baseTrailerModel.getTrailerTypeValue();
+                                    if (carNameMap.containsKey(carName)) {
+                                        carNameMap.put(carName, Integer.parseInt(carNameMap.get(carName).toString()) + 1);
+                                        continue;
+                                    } else {
+                                        billFileVo.setType(busSalesOrder.getBillingType());
+                                        if (loanSolutions != null) {
+                                            if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) {
+                                                billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount());
+                                            }
+                                        }
+                                        billFileVo.setCarName(carName);
+                                        if (busSalesOrderModel != null) {
+                                            billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+                                        }
+                                        carNameMap.put(carName, 1);
+                                        list.add(billFileVo);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (!list.isEmpty()) {
+                        for (int i = 0; i < list.size(); i++) {
+                            BillFileVo billFileVo1 = list.get(i);
+                            String carName = billFileVo1.getCarName();
+                            if (carNameMap.containsKey(carName)) {
+                                billFileVo1.setNum(carNameMap.get(carName).toString());
+                            }
+                        }
+                    }
+                    map.put("list", list);
+                    map.put("name", finBillVehicleDto.getOpenTickName());
+                    String date = DateUtil.today();
+                    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);
+                    if (!"02".equals(finBillVehicleDto.getBillTypeKey())) {
+                        if (finCompanyInvoicingDetailsVo != null) {
+                            //生成车辆登记合同
+                            if (busSalesOrder != null) {
+                                carMap.put("Yf", busSalesOrder.getCustomerName());
+                                carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
+                            }
+                            carMap.put("contractNo", "D" + map.get("contractNo"));
+                            if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                                ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                                if (invoicingDetailsVoResultBean.getData() != null) {
+                                    carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                                }
+                            }
+                            carMap.put("date", date);
+                            List<CarContractListVo> carContractListVos = new ArrayList<>();
+                            for (BusBillVehicleDto salesOrderVehicle : sameOpenTickSidList) {
+                                CarContractListVo carContractListVo = new CarContractListVo();
+                                BaseVehicle baseVehicle = baseMapper.selectByVinSid(salesOrderVehicle.getVehSid());
+                                carContractListVo.setBrand(baseVehicle.getModelName());
+                                carContractListVo.setVinNo(baseVehicle.getVinNo());
+                                carContractListVo.setEnginNo(baseVehicle.getEngineNo());
+                                carContractListVos.add(carContractListVo);
+                            }
+                            carMap.put("carLists", carContractListVos);
+                        }
+                    }
+                }
+                if (loanSolutions != null) {
+                    if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) {
+                        String remarks = "";
+                        String date = DateUtil.today();
+                        List<String> dateString = Arrays.asList(date.split("-"));
+                        String year = dateString.get(0);
+                        String month = dateString.get(1);
+                        String day = dateString.get(2);
+                        filemap.put("year", year);
+                        filemap.put("month", month);
+                        filemap.put("day", day);
+                        if (finCompanyInvoicingDetailsVo != null) {
+                            filemap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
+                            filemap.put("customerName", finCompanyInvoicingDetailsVo.getName());//乙方
+                            filemap.put("invoiceNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号
+                            filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//乙方证件号码
+                            filemap.put("adds", finCompanyInvoicingDetailsVo.getAddress());//户籍地址
+                        } else {
+                            CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(dto.getOpenTickSid());
+                            if (crmCustomerTemp != null) {
+                                filemap.put("invoiceName", crmCustomerTemp.getName());//开票名称
+                                filemap.put("customerName", crmCustomerTemp.getName());//乙方
+                                filemap.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号
+                                filemap.put("idNo", crmCustomerTemp.getIDNumber());//乙方证件号码
+                                filemap.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址
+                            }
+                        }
+                        filemap.put("invoiceType", dto.getOpenTickTypeValue());//开票类型
+                        remarks = "数量" + finBillVehicles.size() + "台，单台成交价：        元。";
+                        filemap.put("remarks", remarks);
+                        filemap.put("busSid", busSalesOrder.getSid());
+                        ResultBean<Map<String, Object>> mapResultBean = commonContractFeign.getModelMap(filemap);
+                        checkMap = mapResultBean.getData();
+                        //生成新车空白合同
+                        checkMap.put("totalPrice", "");
+                        checkMap.put("priceRemarks", "");
+                        checkMap.put("depositTotal", "");
+                        checkMap.put("createOrgName", "");
+                        checkMap.put("payTypeKey", busSalesOrder.getPayTypeKey());
+                    }
+                }
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(1, 2,
+                            1000, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+
+                    if (!map.isEmpty()) {
+                        Future<String> future1 = pool.submit(() -> {
+                            return getInvoiceApplyFile(map);
+                        });
+                        if (StringUtils.isNotBlank(future1.get())) {
+                            File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get());
+                            filesList.add(file);
+                        }
+                    }
+                    if (!carMap.isEmpty()) {
+                        Future<String> future2 = pool.submit(() -> {
+                            return getCarFile(carMap);
+                        });
+                        if (StringUtils.isNotBlank(future2.get())) {
+                            File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get());
+                            filesList.add(file);
+                        }
+                    }
+                    if("1".equals(busSalesOrder.getPayTypeKey())){
+                        Map<String, Object> finalCheckMap = checkMap;
+                        if (!finalCheckMap.isEmpty()) {
+                            Future<String> future3 = pool.submit(() -> {
+                                return blackFile(finalCheckMap);
+                            });
+                            if (StringUtils.isNotBlank(future3.get())) {
+                                File file = new File(docPdfComponent.getUploadTemplateUrl() + future3.get());
+                                filesList.add(file);
+                            }
+                        }
+                    }
+
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("生成文件失败：==========================" + e.getMessage());
+                }
+
+            });
+            if (filesList.size() > 0) {
+                String typeName = contractNo + "开票附件.pdf";
+                try {
+                    File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
+                fileUrl = typeName;
+            }
+        }
+        if(StringUtils.isNotBlank(fileUrl)){
+            BusBillApplication finBillApplication = fetchBySid(dto.getSid());
+            finBillApplication.setFileUrl(fileUrl);
+            baseMapper.updateById(finBillApplication);
+        }
+        return fileUrl;
+    }
+
+    public void createContractNo(BusBillApplicationDto dto){
+       /* try {
+            ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                    .setNameFormat("demo-pool-%d").build();
+            ExecutorService pool = new ThreadPoolExecutor(1, 2,
+                    1000, TimeUnit.MILLISECONDS,
+                    new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+            Future future1 = pool.submit(() -> {
+                String fileUrl = getFileUrl(dto);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("生成文件失败：==========================" + e.getMessage());
+        }*/
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java

@@ -76,6 +76,10 @@ public class BillApplicationIInfoVoss {
     private String billNo;
     @ApiModelProperty("是否可以编辑开票价")
     private Boolean isCanEdit;
+    @ApiModelProperty("不可修改类型和名称")
+    private Boolean noEditInvoiceTypeAndName;
+    @ApiModelProperty("不可修改开票金额")
+    private Boolean noEditInvoiceMoney;
 
     @ApiModelProperty("任务id")
     private String taskId;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillFileVo.java

@@ -20,4 +20,5 @@ public class BillFileVo {
     private String openPrice;
     @ApiModelProperty("发票类型")
     private String type;
+    private String vinNo;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java

@@ -118,4 +118,6 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
     BaseVehicle selectByVinSid(String vehSid);
 
     CrmCustomerTemp selectByCustomerSid(String openTickSid);
+
+    BaseVehicle selectVinNoByVinSid(String vehSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@@ -219,4 +219,8 @@
     <select id="selectByCustomerSid" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp">
         select * from anrui_crm.crm_customer_temp where sid = #{openTickSid}
     </select>
+
+    <select id="selectVinNoByVinSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
+        select * from anrui_base.base_vehicle where sid = #{vehSid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -84,6 +84,7 @@ import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
 import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApply;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
@@ -110,6 +111,12 @@ import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.*;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerFeign;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFile;
+import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo;
+import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewFeign;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
@@ -125,6 +132,7 @@ import com.yxt.messagecenter.api.message.*;
 import com.yxt.messagecenter.api.messagelist.MessageList;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -139,6 +147,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
+import static java.util.Collections.singletonList;
 import static java.util.Comparator.comparing;
 
 /**
@@ -212,6 +221,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     @Autowired
     private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
     @Autowired
+    private LoanHomevisitInvestigateFeign loanHomevisitInvestigateFeign;
+    @Autowired
+    private LoanHomevisitInvestigateCustomerFeign loanHomevisitInvestigateCustomerFeign;
+    @Autowired
+    private LoanNoGuaranteeCreditReviewFeign loanNoGuaranteeCreditReviewFeign;
+    @Autowired
     private FlowFeign flowFeign;
     @Autowired
     private BaseVehicleStateFeign baseVehicleStateFeign;
@@ -502,11 +517,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplication.setBillNo(billNo);
             finBillApplication.setNum(finBillVehicles.size());
             finBillApplication.setArrearsMoney("0");
-           /* String fileUrl = getFileUrl(dto);
+            dto.setSid(finBillApplication.getSid());
-            if (StringUtils.isNotBlank(fileUrl)) {
-                finBillApplication.setFileUrl(fileUrl);
-            }*/
             save(finBillApplication);
+            createContractNo(dto);
             //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
                 FinBillVehicle finBillVehicle = new FinBillVehicle();
@@ -590,6 +603,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillFileDto.setAttachType(FinAttachTypeEnum.ZJ.getAttachType());
                 finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
+
             return rb.success().setMsg("保存成功").setData(finBillApplication.getSid());
         }
         FinBillApplication finBillApplication = fetchBySid(dtoSid);
@@ -598,6 +612,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         dto.setArrearsMoney("0");
         updateByDto(dto);
+        createContractNo(dto);
         finBillFileService.deleteByFinAppSid(dtoSid);
         //附件信息
         if (carBuyContractImages != null) {
@@ -719,31 +734,43 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     }
                     map.put("contractNo", busSalesOrder.getContractNo());
                     List<BillFileVo> list = new ArrayList<>();
-
+                    //====================================主车开始
                     BillFileVo billFileVo = new BillFileVo();
                     if (busSalesOrderModel != null) {
                         billFileVo.setCarName(busSalesOrderModel.getModelName());
                         billFileVo.setNum(String.valueOf(sameOpenTickSidList.size()));
                         billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
                     }
-                    if (loanSolutions != null) {
+                   /* if (loanSolutions != null) {
                         if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) {
                             billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount());
                         }
-                    }
+                    }*/
+                    billFileVo.setOpenPrice(dto.getOneBillMoney());
                     billFileVo.setType(finBillVehicleDto.getBillTypeValue());//开票类型
-                    list.add(billFileVo);
+                    List<String> vinNoString = new ArrayList<>();
-
                     List<FinBillTrailerDto> lllList = new ArrayList<>();
+                    BillFileVo finalBillFileVo = billFileVo;
                     sameOpenTickSidList.forEach(v -> {
+                        //车架号
+                        BaseVehicle baseVehicle = baseMapper.selectVinNoByVinSid(v.getVehSid());
+                       /* if(baseVehicle != null){
+                            vinNoString.add(baseVehicle.getVinNo());
+                        }*/
                         List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
                         finBillTrailers.removeAll(Collections.singleton(null));
                         finBillTrailers = finBillTrailers.stream().filter(vv -> vv.getVinNo().contains(v.getVinNo())).collect(Collectors.toList());
                         lllList.addAll(finBillTrailers);
+                       /* String vinNo = String.join(",",vinNoString);
+                        billFileVo.setVinNo(vinNo);*/
+                        list.add(finalBillFileVo);
                     });
+
+                    //==========================主车结束
                     Map<String, Object> carNameMap = new HashMap<>();
                     if (!lllList.isEmpty()) {
                         for (int i = 0; i < lllList.size(); i++) {
+                            List<String> trailerVinString = new ArrayList<>();
                             FinBillTrailerDto finBillTrailerDto = lllList.get(i);
                             billFileVo = new BillFileVo();
                             BaseTrailer baseTrailer = baseMapper.selectByTrailerNo(finBillTrailerDto.getGcVinNo());
@@ -751,36 +778,42 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                                 BaseTrailerModel baseTrailerModel = baseMapper.selectByModelSid(baseTrailer.getTrailerModelSid());
                                 if (baseTrailerModel != null) {
                                     String carName = "外廓-" + Integer.parseInt(baseTrailerModel.getAppearanceSizeLong()) / 1000 + "米" + "\t" + baseTrailerModel.getTrailerTypeValue();
-                                    if (carNameMap.containsKey(carName)) {
+                                   /* if (carNameMap.containsKey(carName)) {
-                                        carNameMap.put(carName, Integer.parseInt(carNameMap.get(carName).toString()) + 1);
+                                        carNameMap.put(carName, Arrays.asList(carNameMap.get(carName).toString()).add(baseTrailer.getVinNo()));
                                         continue;
                                     } else {
                                         billFileVo.setType(busSalesOrder.getBillingType());
-                                        if (loanSolutions != null) {
-                                            if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) {
-                                                billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount());
-                                            }
-                                        }
                                         billFileVo.setCarName(carName);
                                         if (busSalesOrderModel != null) {
                                             billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
                                         }
-                                        carNameMap.put(carName, 1);
+                                        trailerVinString.add(baseTrailer.getVinNo());
+                                        carNameMap.put(carName,trailerVinString);
                                         list.add(billFileVo);
-                                    }
+                                    }*/
+                                    billFileVo.setCarName(carName);
+                                    billFileVo.setVinNo(baseTrailer.getVinNo());
+                                    billFileVo.setOpenPrice(finBillTrailerDto.getOneBillMoney());
+                                    billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+                                    billFileVo.setType(finBillTrailerDto.getBillTypeValue());
+                                    list.add(billFileVo);
                                 }
                             }
                         }
                     }
-                    if (!list.isEmpty()) {
+                    /*if (!list.isEmpty()) {
                         for (int i = 0; i < list.size(); i++) {
                             BillFileVo billFileVo1 = list.get(i);
                             String carName = billFileVo1.getCarName();
                             if (carNameMap.containsKey(carName)) {
-                                billFileVo1.setNum(carNameMap.get(carName).toString());
+                                List<String> ssList = castList(carNameMap.get(carName),String.class);
+                                String trailerVinNo = String.join(",",ssList);
+                                billFileVo1.setOpenPrice(Arrays.asList(carName.split("#")).get(1));
+                                billFileVo1.setCarName(Arrays.asList(carName.split("#")).get(0));
+                                billFileVo1.setVinNo(trailerVinNo);
                             }
                         }
-                    }
+                    }*/
                     map.put("list", list);
                     map.put("name", finBillVehicleDto.getOpenTickName());
                     String date = DateUtil.today();
@@ -791,7 +824,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     map.put("year", year);
                     map.put("month", month);
                     map.put("day", day);
-                    if (!"02".equals(finBillVehicleDto.getBillTypeKey())) {
+                    FinCompanyInvoicing finCompanyInvoicing = finCompanyInvoicingService.fetchBySid(openTickSid);
+                    if (!"02".equals(finBillVehicleDto.getBillTypeKey()) && finCompanyInvoicing != null) {//机动车
                         if (finCompanyInvoicingDetailsVo != null) {
                             //生成车辆登记合同
                             if (busSalesOrder != null) {
@@ -819,45 +853,48 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         }
                     }
                 }
-                if (loanSolutions != null) {
+
-                    if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) {
+                if("1".equals(busSalesOrder.getPayTypeKey())){
-                        String remarks = "";
+                    if (loanSolutions != null) {
-                        String date = DateUtil.today();
+                        if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) {
-                        List<String> dateString = Arrays.asList(date.split("-"));
+                            String remarks = "";
-                        String year = dateString.get(0);
+                            String date = DateUtil.today();
-                        String month = dateString.get(1);
+                            List<String> dateString = Arrays.asList(date.split("-"));
-                        String day = dateString.get(2);
+                            String year = dateString.get(0);
-                        filemap.put("year", year);
+                            String month = dateString.get(1);
-                        filemap.put("month", month);
+                            String day = dateString.get(2);
-                        filemap.put("day", day);
+                            filemap.put("year", year);
-                        if (finCompanyInvoicingDetailsVo != null) {
+                            filemap.put("month", month);
-                            filemap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
+                            filemap.put("day", day);
-                            filemap.put("customerName", finCompanyInvoicingDetailsVo.getName());//乙方
+                            if (finCompanyInvoicingDetailsVo != null) {
-                            filemap.put("invoiceNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号
+                                filemap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
-                            filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//乙方证件号码
+                                filemap.put("customerName", finCompanyInvoicingDetailsVo.getName());//乙方
-                            filemap.put("adds", finCompanyInvoicingDetailsVo.getAddress());//户籍地址
+                                filemap.put("invoiceNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号
-                        } else {
+                                filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//乙方证件号码
-                            CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(dto.getOpenTickSid());
+                                filemap.put("adds", finCompanyInvoicingDetailsVo.getAddress());//户籍地址
-                            if (crmCustomerTemp != null) {
+                            } else {
-                                filemap.put("invoiceName", crmCustomerTemp.getName());//开票名称
+                                CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(dto.getOpenTickSid());
-                                filemap.put("customerName", crmCustomerTemp.getName());//乙方
+                                if (crmCustomerTemp != null) {
-                                filemap.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号
+                                    filemap.put("invoiceName", crmCustomerTemp.getName());//开票名称
-                                filemap.put("idNo", crmCustomerTemp.getIDNumber());//乙方证件号码
+                                    filemap.put("customerName", crmCustomerTemp.getName());//乙方
-                                filemap.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址
+                                    filemap.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号
+                                    filemap.put("idNo", crmCustomerTemp.getIDNumber());//乙方证件号码
+                                    filemap.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址
+                                }
                             }
+                            filemap.put("invoiceType", dto.getOpenTickTypeValue());//开票类型
+                            remarks = "数量" + finBillVehicles.size() + "台，单台成交价：        元。";
+                            filemap.put("remarks", remarks);
+                            filemap.put("busSid", busSalesOrder.getSid());
+                            ResultBean<Map<String, Object>> mapResultBean = commonContractFeign.getModelMap(filemap);
+                            checkMap = mapResultBean.getData();
+                            //生成新车空白合同
+                            checkMap.put("totalPrice", "");
+                            checkMap.put("priceRemarks", "");
+                            checkMap.put("depositTotal", "");
+                            checkMap.put("createOrgName", "");
+                            checkMap.put("payTypeKey", busSalesOrder.getPayTypeKey());
                         }
-                        filemap.put("invoiceType", dto.getOpenTickTypeValue());//开票类型
-                        remarks = "数量" + finBillVehicles.size() + "台，单台成交价：        元。";
-                        filemap.put("remarks", remarks);
-                        filemap.put("busSid", busSalesOrder.getSid());
-                        ResultBean<Map<String, Object>> mapResultBean = commonContractFeign.getModelMap(filemap);
-                        checkMap = mapResultBean.getData();
-                        //生成新车空白合同
-                        checkMap.put("totalPrice", "");
-                        checkMap.put("priceRemarks", "");
-                        checkMap.put("depositTotal", "");
-                        checkMap.put("createOrgName", "");
-                        checkMap.put("payTypeKey", busSalesOrder.getPayTypeKey());
                     }
                 }
                 try {
@@ -916,7 +953,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 fileUrl = typeName;
             }
         }
-
+        if(StringUtils.isNotBlank(fileUrl)){
+            FinBillApplication finBillApplication = fetchBySid(dto.getSid());
+            finBillApplication.setFileUrl(fileUrl);
+            baseMapper.updateById(finBillApplication);
+        }
         return fileUrl;
     }
 
@@ -1001,10 +1042,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         FinBillApplication entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
-       /* String fileUrl = getFileUrl(dto);
-        if (StringUtils.isNotBlank(fileUrl)) {
-            entity.setFileUrl(fileUrl);
-        }*/
         baseMapper.updateById(entity);
     }
 
@@ -1012,13 +1049,27 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         FinBillApplication entity = fetchBySid(sid);
         List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
         String contractNo = entity.getContractNo();
-        BigDecimal oneBillMoney = entity.getOneBillMoney();
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
+        SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData();
+        BigDecimal oneBillMoney;
+        /*if ("2".equals(entity.getSaleTypeKey())){
+            oneBillMoney = new BigDecimal(solutionsDetailsVo.getMainVehicleAmount());
+            entity.setOneBillMoney(oneBillMoney);
+            entity.setTotalBillMoney(oneBillMoney.multiply(new BigDecimal(finBillVehicleVos.size())));
+            entity.setOpenTickTypeKey(busSalesOrder.getBillingTypeKey());
+            entity.setOpenTickTypeValue(busSalesOrder.getBillingType());
+        }else {
+            oneBillMoney = entity.getOneBillMoney();
+            if (oneBillMoney != null) {
+                entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size())));
+            }
+        }*/
+        oneBillMoney = entity.getOneBillMoney();
         if (oneBillMoney != null) {
             entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size())));
         }
         FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
         BeanUtil.copyProperties(entity, vo);
-        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
         vo.setBusSalesOrderSid(busSalesOrder.getSid());
         if (finBillVehicleVos != null) {
             for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
@@ -1027,6 +1078,29 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     List<String> clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
                     finBillVehicleVo.setCertificatePhoto(clhgeImages);
                 }
+                /*BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(contractNo, finBillVehicleVo.getVehSid()).getData();
+                if ("2".equals(entity.getSaleTypeKey())){
+                    if ("01".equals(busSalesOrder.getFinancePlan())){//担保
+                        String jfkcSid = loanHomevisitInvestigateFeign.selSaleOrderSidAndBorrSid(busSalesOrder.getSid(), busSalesOrderVehicle.getBorrowerSid()).getData();
+                        LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(jfkcSid).getData();
+                        finBillVehicleVo.setBillTypeKey(busSalesOrder.getBillingTypeKey());
+                        finBillVehicleVo.setBillTypeValue(busSalesOrder.getBillingType());
+                        if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+                            finBillVehicleVo.setOpenTickName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
+                        }else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+                            finBillVehicleVo.setOpenTickName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName());
+                        }
+                    }else if ("02".equals(busSalesOrder.getFinancePlan())){//非担保
+                        LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                        finBillVehicleVo.setBillTypeKey(busSalesOrder.getBillingTypeKey());
+                        finBillVehicleVo.setBillTypeValue(busSalesOrder.getBillingType());
+                        if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
+                            finBillVehicleVo.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName());
+                        }else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
+                            finBillVehicleVo.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
+                        }
+                    }
+                }*/
             }
         }
         vo.setFinBillVehicles(finBillVehicleVos);
@@ -2338,11 +2412,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             //计算开票金额合计
             BigDecimal totalBillMoney = oneBillMoney.multiply(new BigDecimal(finBillVehicles.size()));
             finBillApplication.setTotalBillMoney(totalBillMoney);
-            String fileUrl = getFileUrl(dto);
+            dto.setSid(finBillApplication.getSid());
-            if (StringUtils.isNotBlank(fileUrl)) {
-                finBillApplication.setFileUrl(fileUrl);
-            }
             save(finBillApplication);
+            createContractNo(dto);
             //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
                 FinBillVehicle finBillVehicle = new FinBillVehicle();
@@ -2473,6 +2545,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         dto.setBillStateKey("003");
         dto.setBillStateValue("欠款开票");
         updateByDto(dto);
+        createContractNo(dto);
         finBillFileService.deleteByFinAppSid(dtoSid);
         //附件信息
         if (khkpsqsApplicationAppendxs.size() > 0) {
@@ -5084,14 +5157,36 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
     public ResultBean<BillApplicationIInfoVoss> selectByContractNo(String contractId, List<String> vins) {
         ResultBean<BillApplicationIInfoVoss> rb = ResultBean.fireFail();
-        BillApplicationIInfoVoss billApplicationIInfoVoss = new BillApplicationIInfoVoss();
+        BillApplicationIInfoVoss billApplicationIInfoVoss;
         BusSalesOrder busSalesOrder = baseMapper.selectNo(contractId);
+        SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData();
         billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId);
-        if ("1".equals(busSalesOrder.getPayTypeKey())) {
+        BigDecimal oneBillMoney;
+        if ("2".equals(busSalesOrder.getPayTypeKey())){
+            oneBillMoney = new BigDecimal(solutionsDetailsVo.getMainVehicleAmount());
+            billApplicationIInfoVoss.setInvoiceMoney(oneBillMoney.toString());
+            billApplicationIInfoVoss.setInvoiceTotal(oneBillMoney.multiply(new BigDecimal(vins.size())).toString());
+            billApplicationIInfoVoss.setOpenTickTypeKey(busSalesOrder.getBillingTypeKey());
+            billApplicationIInfoVoss.setOpenTickTypeValue(busSalesOrder.getBillingType());
+            billApplicationIInfoVoss.setNoEditInvoiceTypeAndName(true);
+            billApplicationIInfoVoss.setNoEditInvoiceMoney(true);
+        }else {
+            oneBillMoney = busSalesOrder.getOneBillMoney();
+            if (oneBillMoney != null) {
+                billApplicationIInfoVoss.setInvoiceMoney(oneBillMoney.toString());
+                billApplicationIInfoVoss.setInvoiceTotal(oneBillMoney.multiply(new BigDecimal(vins.size())).toString());
+                billApplicationIInfoVoss.setNoEditInvoiceTypeAndName(false);
+                billApplicationIInfoVoss.setNoEditInvoiceMoney(true);
+            }else {
+                billApplicationIInfoVoss.setNoEditInvoiceTypeAndName(false);
+                billApplicationIInfoVoss.setNoEditInvoiceMoney(false);
+            }
+        }
+        /*if ("1".equals(busSalesOrder.getPayTypeKey())) {
             billApplicationIInfoVoss.setIsCanEdit(true);
         } else {
             billApplicationIInfoVoss.setIsCanEdit(false);
-        }
+        }*/
         //开票单位
         if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
             ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
@@ -5102,7 +5197,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<VinListVos> vinListVos = new ArrayList<>();
         List<FinBillTrailerVo> pcSelBillGcVos = new ArrayList<>();
         for (int i = 0; i < vins.size(); i++) {
-            VinListVos vinListVos1 = new VinListVos();
+            VinListVos vinListVos1;
             vinListVos1 = baseMapper.selectByBus(contractId, vins.get(i));
             //主车合格证照片
             BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vins.get(i)).getData();
@@ -5121,6 +5216,30 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     pcSelBillGcVos.add(pcSelBillGcVo);
                 }
             }
+            //贷款主车初始化开票名称、开票类型
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(contractId, vins.get(i)).getData();
+            if ("2".equals(busSalesOrder.getPayTypeKey())){
+                if ("01".equals(busSalesOrder.getFinancePlan())){//担保
+                    String jfkcSid = loanHomevisitInvestigateFeign.selSaleOrderSidAndBorrSid(busSalesOrder.getSid(), busSalesOrderVehicle.getBorrowerSid()).getData();
+                    LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(jfkcSid).getData();
+                    vinListVos1.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
+                    vinListVos1.setInvoiceType(busSalesOrder.getBillingType());
+                    if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+                        vinListVos1.setInvoiceName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
+                    }else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+                        vinListVos1.setInvoiceName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName());
+                    }
+                }else if ("02".equals(busSalesOrder.getFinancePlan())){//非担保
+                    LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                    vinListVos1.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
+                    vinListVos1.setInvoiceType(busSalesOrder.getBillingType());
+                    if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
+                        vinListVos1.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName());
+                    }else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
+                        vinListVos1.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
+                    }
+                }
+            }
             vinListVos.add(vinListVos1);
         }
         billApplicationIInfoVoss.setVinList(vinListVos);
@@ -5133,4 +5252,31 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.selectByCon(contractNo);
         return rb.success().setData(finBillApplicationDetailsVo);
     }
+
+    public void createContractNo(FinBillApplicationDto dto){
+        /*try {
+            ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                    .setNameFormat("demo-pool-%d").build();
+            ExecutorService pool = new ThreadPoolExecutor(1, 2,
+                    1000, TimeUnit.MILLISECONDS,
+                    new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+            Future future1 = pool.submit(() -> {
+                String fileUrl = getFileUrl(dto);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("生成文件失败：==========================" + e.getMessage());
+        }*/
+    }
+
+    public List<String> castList(Object obj, Class<String> clazz){
+        List<String> result = new ArrayList<>();
+        if(obj instanceof List<?>){
+            for (Object o : (List<?>) obj){
+                result.add(clazz.cast(o));
+            }
+            return result;
+        }
+        return new ArrayList<>();
+    }
 }

anrui-fin/anrui-fin-biz/src/main/resources/ftl/invoiceApply.ftl

@@ -998,7 +998,7 @@
                                     <w:sz w:val="28"/>
                                     <w:sz-cs w:val="28"/>
                                 </w:rPr>
-                                <w:t>数量</w:t>
+                                <w:t>车架号</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>
@@ -1194,7 +1194,7 @@
                                     <w:kern w:val="0"/>
                                     <w:sz-cs w:val="21"/>
                                 </w:rPr>
-                                <w:t>${car.num!}</w:t>
+                                <w:t>${car.vinNo!}</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java

@@ -222,4 +222,9 @@ public interface LoanHomevisitInvestigateFeign {
     @PostMapping("/selIsCompanyBuy")
     @ResponseBody
     ResultBean<String> selIsCompanyBuy(@RequestParam("orderSid") String orderSid,@RequestParam("borrowerSid") String borrowerSid);
+
+    @ApiOperation("根据销售订单sid和贷款人sid查询家访考察sid")
+    @PostMapping("/selSaleOrderSidAndBorrSid")
+    @ResponseBody
+    ResultBean<String> selSaleOrderSidAndBorrSid(@RequestParam("orderSid") String orderSid,@RequestParam("borrowerSid") String borrowerSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java

@@ -215,4 +215,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	public ResultBean<String> selIsCompanyBuy(String orderSid, String borrowerSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java

@@ -27,4 +27,9 @@ public class LoanNoGuaranteeCreditReviewFallback implements LoanNoGuaranteeCredi
     public ResultBean rePush(String salesOrderSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> selByBorrSid(String borrowerSid) {
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java

@@ -41,4 +41,7 @@ public interface LoanNoGuaranteeCreditReviewFeign {
     @PostMapping("/rePush")
     public ResultBean rePush(@RequestParam("salesOrderSid") String salesOrderSid);
 
+    @ApiOperation("根据贷款人sid查询")
+    @PostMapping("/selByBorrSid")
+    ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> selByBorrSid(@RequestParam("borrowerSid") String borrowerSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java

@@ -658,6 +658,7 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }
+            UpdateFlowFieldVo ufVo = resultBean.getData();
             int i = updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 LoanCustomerRecord entity = this.fetchBySid(businessSid);
@@ -821,6 +822,21 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
                         crmCustomerTempFeign.updateByEntity(customerTemp);
                     }
                 }
+            } else {
+                //极光推送
+                loanCustomerRecord = fetchBySid(businessSid);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                messageFlowVo.setProcDefId(loanCustomerRecord.getProcDefId());
+                messageFlowVo.setProcInsId(loanCustomerRecord.getProcInstId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("欠款客户备案");
+                messageFlowableQuery.setMsgContent(loanCustomerRecord.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                messageFlowableQuery.setMsgTitle("欠款客户备案");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             }
             return rb.success().setData(resultBean.getData());
         } else {

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

@@ -95,4 +95,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper<LoanHomevisit
     String selectByBorrSid(String borrowerSid);
 
     String selIsCompanyBuy(@Param("orderSid") String orderSid, @Param("borrowerSid") String borrowerSid);
+
+    @Select("select sid from loan_homevisit_investigate where saleOrderSid = #{orderSid} and saleOrderBorrowerSid = #{borrowerSid}")
+    String selSaleOrderSidAndBorrSid(@Param("orderSid") String orderSid,@Param("borrowerSid") String borrowerSid);
 }

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

@@ -240,4 +240,9 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
     public ResultBean<String> selIsCompanyBuy(String orderSid, String borrowerSid) {
         return loanHomevisitInvestigateService.selIsCompanyBuy(orderSid,borrowerSid);
     }
+
+    @Override
+    public ResultBean<String> selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) {
+        return loanHomevisitInvestigateService.selSaleOrderSidAndBorrSid(orderSid,borrowerSid);
+    }
 }

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

@@ -2111,4 +2111,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         String isKp = baseMapper.selIsCompanyBuy(orderSid,borrowerSid);
         return rb.success().setData(isKp);
     }
+
+    public ResultBean<String> selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = baseMapper.selSaleOrderSidAndBorrSid(orderSid,borrowerSid);
+        return rb.success().setData(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java

@@ -5,6 +5,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.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReview;
+import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -25,4 +26,7 @@ public interface LoanNoGuaranteeCreditReviewMapper extends BaseMapper<LoanNoGuar
     LoanNoGuaranteeCreditReview selectOneByBorrowerSid(String salesOrderSid);
 
     int updateByBorrow(String borrowerSid);
+
+    @Select("SELECT * FROM loan_noguarantee_credit_review WHERE borrowerSid = #{borrowerSid}")
+    LoanNoGuaranteeCreditReviewDetailsVo selByBorrSid(String borrowerSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewRest.java

@@ -40,4 +40,9 @@ public class LoanNoGuaranteeCreditReviewRest implements LoanNoGuaranteeCreditRev
     public ResultBean rePush(String salesOrderSid) {
         return loanNoGuaranteeCreditReviewService.rePush(salesOrderSid);
     }
+
+    @Override
+    public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> selByBorrSid(String borrowerSid) {
+        return loanNoGuaranteeCreditReviewService.selByBorrSid(borrowerSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java

@@ -324,4 +324,10 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
         }
         return rb.success();
     }
+
+    public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> selByBorrSid(String borrowerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = baseMapper.selByBorrSid(borrowerSid);
+        return rb.success().setData(loanNoGuaranteeCreditReviewDetailsVo);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -213,6 +213,17 @@ public class InvoicedService {
         }
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
         BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
+        /*if ("2".equals(finBillApplicationDetailsVo.getSaleTypeKey())){
+            vo.setNoEditInvoiceTypeAndName(true);
+            vo.setNoEditInvoiceMoney(true);
+        }else if ("1".equals(finBillApplicationDetailsVo.getSaleTypeKey())){
+            vo.setNoEditInvoiceTypeAndName(false);
+            if (finBillApplicationDetailsVo.getOneBillMoney() != null){
+                vo.setNoEditInvoiceMoney(true);
+            }else {
+                vo.setNoEditInvoiceMoney(false);
+            }
+        }*/
         vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
         vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney());
         vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java

@@ -30,6 +30,7 @@ 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.apache.ibatis.annotations.Delete;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -76,7 +77,7 @@ public class AsServiceSubjectRest{
 	}
 
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		ResultBean rb = ResultBean.fireFail();
 		asServiceSubjectService.delBySids(sids);