Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -522,18 +522,27 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         }
         //-------------- 推送维护企业开票信息 ------------------------
         if (StringUtils.isNotBlank(dto.getRegistNum())) {
-            FinCompanyInvoicingDetailsVo invoicing = finCompanyInvoicingFeign.selectInvoingByTaxpayerNo(dto.getRegistNum()).getData();
+            FinCompanyInvoicingDetailsVo invoicing = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(dto.getRegistNum(),dto.getUseOrg()).getData();
             FinCompanyInvoicingDto invoicingDto = new FinCompanyInvoicingDto();
-            invoicingDto.setAddress(dto.getRegistDetailAddress());
-            invoicingDto.setTaxpayerNo(dto.getRegistNum());
-            invoicingDto.setName(dto.getDisName());
+            if (StringUtils.isNotBlank(dto.getRegistDetailAddress())) {
+                invoicingDto.setAddress(dto.getRegistDetailAddress());
+            }
+            if (StringUtils.isNotBlank(dto.getRegistNum())) {
+                invoicingDto.setTaxpayerNo(dto.getRegistNum());
+            }
+            if (StringUtils.isNotBlank(dto.getDisName())) {
+                invoicingDto.setName(dto.getDisName());
+            }
             if (null != invoicing) {
                 invoicingDto.setSid(invoicing.getSid());
+                invoicingDto.setUseOrgSid(invoicing.getUseOrgSid());
             } else {
                 invoicingDto.setCreateBySid(dto.getUserSid());
                 invoicingDto.setOrgSidPath(dto.getOrgSidPath());
                 invoicingDto.setUseOrgName(dto.getUseOrgName());
                 invoicingDto.setUseOrgSid(dto.getUseOrg());
+                invoicingDto.setOpenTickTypeKey("01");
+                invoicingDto.setOpenTickTypeValue("机动车销售统一发票");
             }
             finCompanyInvoicingFeign.qySaveOrUpdate(invoicingDto);
         }
@@ -636,18 +645,27 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         if (i1 > 0) {
             //-------------- 推送维护企业开票信息 ------------------------
             if (StringUtils.isNotBlank(dto.getRegistNum())) {
-                FinCompanyInvoicingDetailsVo invoicing = finCompanyInvoicingFeign.selectInvoingByTaxpayerNo(dto.getRegistNum()).getData();
+                FinCompanyInvoicingDetailsVo invoicing = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(dto.getRegistNum(),dto.getUseOrg()).getData();
                 FinCompanyInvoicingDto invoicingDto = new FinCompanyInvoicingDto();
-                invoicingDto.setAddress(dto.getRegistDetailAddress());
-                invoicingDto.setTaxpayerNo(dto.getRegistNum());
-                invoicingDto.setName(dto.getDisName());
+                if (StringUtils.isNotBlank(dto.getRegistDetailAddress())) {
+                    invoicingDto.setAddress(dto.getRegistDetailAddress());
+                }
+                if (StringUtils.isNotBlank(dto.getRegistNum())) {
+                    invoicingDto.setTaxpayerNo(dto.getRegistNum());
+                }
+                if (StringUtils.isNotBlank(dto.getDisName())) {
+                    invoicingDto.setName(dto.getDisName());
+                }
                 if (null != invoicing) {
                     invoicingDto.setSid(invoicing.getSid());
+                    invoicingDto.setUseOrgSid(invoicing.getUseOrgSid());
                 } else {
                     invoicingDto.setCreateBySid(dto.getUserSid());
                     invoicingDto.setOrgSidPath(dto.getOrgSidPath());
                     invoicingDto.setUseOrgName(dto.getUseOrgName());
                     invoicingDto.setUseOrgSid(dto.getUseOrg());
+                    invoicingDto.setOpenTickTypeKey("01");
+                    invoicingDto.setOpenTickTypeValue("机动车销售统一发票");
                 }
                 finCompanyInvoicingFeign.qySaveOrUpdate(invoicingDto);
             }

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

@@ -224,14 +224,14 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
                 voucherDetail1.setAmount(v.getDuePushMoney());
                 List<SysOrganizationVo> deptVo = sysOrganizationFeign.selectChildrenListBySid(planDetails.getUseOrgSid()).getData();
                 if (!deptVo.isEmpty()) {
-                    deptVo.stream().forEach(d -> {
+                    for (SysOrganizationVo d : deptVo) {
                         if (d.getName().equals("金融服务部")) {
                             voucherDetail1.setDeptCode(d.getOrgCode());
                         }
-                    });
+                    }
                 }
                 voucherDetails.add(voucherDetail1);
-                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(v.getBusVinSid()).getData();
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
                 if (null != busSalesOrderVehicle) {
                     BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
                     String deptSid = salesOrder.getOrgSid();