问题修改

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-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -1026,8 +1026,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         String contractNo = entity.getContractNo();
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
         SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData();
-        BigDecimal oneBillMoney = new BigDecimal("0");
-        if ("2".equals(entity.getSaleTypeKey())){
+        BigDecimal oneBillMoney;
+        /*if ("2".equals(entity.getSaleTypeKey())){
             oneBillMoney = new BigDecimal(solutionsDetailsVo.getMainVehicleAmount());
             entity.setOneBillMoney(oneBillMoney);
             entity.setTotalBillMoney(oneBillMoney.multiply(new BigDecimal(finBillVehicleVos.size())));
@@ -1038,6 +1038,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             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);
@@ -1049,7 +1053,7 @@ 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();
+                /*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();
@@ -1071,7 +1075,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                             finBillVehicleVo.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
                         }
                     }
-                }
+                }*/
             }
         }
         vo.setFinBillVehicles(finBillVehicleVos);
@@ -5128,14 +5132,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());
@@ -5146,7 +5172,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();
@@ -5165,6 +5191,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);

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

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