欠款客户备案更新公司开票信息、还款计划车架号取后八位、权证资料去后八位车架号

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -2238,7 +2238,13 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                                             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vinItem.getVinSid(), orderSid);
                                             if (null != busSalesOrderVehicle) {
                                                 if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                                                    mortagageDto.setVinNo(busSalesOrderVehicle.getLinkNo());
+                                                    String linkNo = busSalesOrderVehicle.getLinkNo();
+                                                    if (linkNo.length() > 8) {
+                                                        String substringLinkNo = linkNo.substring(linkNo.length() - 8);
+                                                        mortagageDto.setVinNo(substringLinkNo);
+                                                    } else {
+                                                        mortagageDto.setVinNo(linkNo);
+                                                    }
                                                 }
                                                 if (StringUtils.isNotBlank(busSalesOrderVehicle.getSid())) {
                                                     mortagageDto.setBusVinSid(busSalesOrderVehicle.getSid());

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -100,6 +100,12 @@ public interface FinCompanyInvoicingFeign {
     @ResponseBody
     ResultBean<FinCompanyInvoicingDetailsVo> selectInvoingByTaxpayerNo(@RequestParam("taxpayerNo") String taxpayerNo);
 
+    @ApiOperation("根据纳税人识别号以及组织sid查询开票信息")
+    @GetMapping("/selByTaxpayerNoAndUseOrgSid")
+    @ResponseBody
+    ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(@RequestParam("taxpayerNo") String taxpayerNo, @RequestParam("useOrgSid") String useOrgSid);
+
+
     @ApiOperation("根据组织全路径查询开票信息")
     @GetMapping("/selectInvoingByOrgPath")
     @ResponseBody
@@ -134,7 +140,7 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qySelByUseOrgSid3")
     @ResponseBody
-    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(@RequestParam("orgSid") String orgSid,@RequestParam("invoiceKey") String invoiceKey);
+    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(@RequestParam("orgSid") String orgSid, @RequestParam("invoiceKey") String invoiceKey);
 
     @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qyAppSelByUseOrgSid")
@@ -144,7 +150,7 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qyAppSelByUseOrgSidTwo")
     @ResponseBody
-    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search,@RequestParam(value = "invoiceKey",required = false)String invoiceKey);
+    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search, @RequestParam(value = "invoiceKey", required = false) String invoiceKey);
 
     @ApiOperation("企业开票信息管理移动端维护初始化")
     @GetMapping("/qyAppFetchDetailsBySid/{sid}")
@@ -159,10 +165,10 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qySelByUseOrgSid2")
     @ResponseBody
-    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("invoiceKey") String invoiceKey);
+    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("invoiceKey") String invoiceKey);
 
     @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qyAppSelByUseOrgSid2")
     @ResponseBody
-    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("search") String search,@RequestParam("invoiceKey") String invoiceKey);
+    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search, @RequestParam("invoiceKey") String invoiceKey);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -95,6 +95,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
         return null;
     }
 
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<FinCompanyInvoicingDetailsVo>> selectInvoingByOrgPath(String orgPath) {
         return null;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java

@@ -83,4 +83,6 @@ public interface FinCompanyInvoicingMapper extends BaseMapper<FinCompanyInvoicin
 
     @Select("select * from fin_company_invoicing where useOrgSid = #{userOrgSid} and isDelete = 0")
     List<FinCompanyInvoicingDetailsVo> selectInvoingByOrgPath(String userOrgSid);
+
+    FinCompanyInvoicingDetailsVo selByTaxpayerNoAndUseOrgSid(@Param("taxpayerNo") String taxpayerNo, @Param("useOrgSid") String useOrgSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -97,6 +97,27 @@
         where taxpayerNo = #{taxpayerNo}
           and isDelete = 0
     </select>
+    <select id="selByTaxpayerNoAndUseOrgSid"
+            resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo">
+        select sid,
+               bankAccount,
+               bankName,
+               `name`,
+               taxpayerNo,
+               address,
+               phone,
+               useOrgSid,
+               useOrgName,
+               purchaseSystemSid,
+               orgSidPath,
+               createBySid,
+               invoiceType    as openTickTypeValue,
+               invoiceTypeKey as openTickTypeKey
+        from fin_company_invoicing
+        where taxpayerNo = #{taxpayerNo}
+          and useOrgSid = #{useOrgSid}
+          and isDelete = 0
+    </select>
 
 
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -122,6 +122,11 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
         return finCompanyInvoicingService.selectInvoingByTaxpayerNo(taxpayerNo);
     }
 
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) {
+        return finCompanyInvoicingService.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid);
+    }
+
     @Override
     public ResultBean<List<FinCompanyInvoicingDetailsVo>> selectInvoingByOrgPath(String orgPath) {
         return finCompanyInvoicingService.selectInvoingByOrgPath(orgPath);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -557,4 +557,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
+
+    public ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) {
+        ResultBean<FinCompanyInvoicingDetailsVo> rb = ResultBean.fireFail();
+        FinCompanyInvoicingDetailsVo vo = baseMapper.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid);
+        return rb.success().setData(vo);
+    }
 }

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

@@ -684,9 +684,11 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
                                 String createBySid = "";
                                 String openTicketType = "";
                                 String openTicketTypeKey = "";
+                                String useOrgSid = "";
                                 if (StringUtils.isNotBlank(entity.getTaxpayerNo())) {
                                     taxpayerNo = entity.getTaxpayerNo();
-                                    FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selectInvoingByTaxpayerNo(taxpayerNo).getData();
+                                    useOrgSid = entity.getUseOrgSid();
+                                    FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid).getData();
                                     if (null != data) {
                                         BeanUtil.copyProperties(data, invoicingDto);
                                         invoicingSid = data.getSid();
@@ -748,9 +750,11 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
                                 String createBySid = "";
                                 String openTicketType = "";
                                 String openTicketTypeKey = "";
+                                String useOrgSid = "";
                                 if (StringUtils.isNotBlank(entity.getIdNumber())) {
                                     taxpayerNo = entity.getIdNumber();
-                                    FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selectInvoingByTaxpayerNo(taxpayerNo).getData();
+                                    useOrgSid = entity.getUseOrgSid();
+                                    FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid).getData();
                                     if (null != data) {
                                         BeanUtil.copyProperties(data, invoicingDto);
                                         invoicingSid = data.getSid();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -186,9 +186,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     }
                     // 主产品首期月还
                     if (null != schedule.getMainFirstRepay()) {
-
                         vo.setMainFirstRepay(schedule.getMainFirstRepay().toString());
-
                     }
                     // 主产品期间月还
                     if (null != schedule.getMainMidRepay()) {
@@ -405,6 +403,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     if (!vehicles.isEmpty()) {
                         for (BusSalesOrderVehicle vehicle : vehicles) {
                             String linkNo = vehicle.getLinkNo();
+                            String vinNo = "";
+                            if (linkNo.length() > 8) {
+                                vinNo = linkNo.substring(linkNo.length() - 8);
+                            } else {
+                                vinNo = linkNo;
+                            }
                             String busVinSid = vehicle.getSid();
                             //主方案
                             for (int i = 0; i < mainPeriod; i++) {
@@ -428,7 +432,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 mainDto.setUseOrgName(useOrgName);
                                 mainDto.setOrgSidPath(orgSidPath);
                                 mainDto.setBusVinSid(busVinSid);
-                                mainDto.setVinNo(linkNo);
+                                mainDto.setVinNo(vinNo);
                                 mainDto.setSalesUserSid(staffSid);
                                 mainDto.setStaffName(staffName);
                                 mainDto.setPolicyOrOther("0");
@@ -467,7 +471,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     otherDto.setUseOrgName(useOrgName);
                                     otherDto.setOrgSidPath(orgSidPath);
                                     otherDto.setBusVinSid(busVinSid);
-                                    otherDto.setVinNo(linkNo);
+                                    otherDto.setVinNo(vinNo);
                                     otherDto.setSalesUserSid(staffSid);
                                     otherDto.setStaffName(staffName);
                                     otherDto.setPolicyOrOther("1");
@@ -559,6 +563,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     if (!vehicles.isEmpty()) {
                         for (BusSalesOrderVehicle vehicle : vehicles) {
                             String linkNo = vehicle.getLinkNo();
+                            String vinNo = "";
+                            if (linkNo.length() > 8) {
+                                vinNo = linkNo.substring(linkNo.length() - 8);
+                            } else {
+                                vinNo = linkNo;
+                            }
                             String busVinSid = vehicle.getSid();
                             //主方案
                             for (int i = 0; i < mainPeriod; i++) {
@@ -582,7 +592,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 mainDto.setUseOrgName(useOrgName);
                                 mainDto.setOrgSidPath(orgSidPath);
                                 mainDto.setBusVinSid(busVinSid);
-                                mainDto.setVinNo(linkNo);
+                                mainDto.setVinNo(vinNo);
                                 mainDto.setSalesUserSid(staffSid);
                                 mainDto.setStaffName(staffName);
                                 mainDto.setPolicyOrOther("1");
@@ -642,7 +652,18 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             if (!busSalesOrderVehicles.isEmpty()) {
                 List<String> stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList());
                 if (!stringVinNos.isEmpty()) {
-                    entity.setVinNo(String.join(",", stringVinNos));
+                    List<String> vinList = new ArrayList<>();
+                    for (String linkNo : stringVinNos) {
+                        String vinNo = "";
+                        if (linkNo.length() > 8) {
+                            vinNo = linkNo.substring(linkNo.length() - 8);
+
+                        } else {
+                            vinNo = linkNo;
+                        }
+                        vinList.add(vinNo);
+                    }
+                    entity.setVinNo(String.join(",", vinList));
                 }
             }
             BusSalesOrderLoancontractDetailsVo loancontractVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(dto.getSalesOrderSid()).getData();
@@ -751,6 +772,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     if (!vehicles.isEmpty()) {
                         for (BusSalesOrderVehicle vehicle : vehicles) {
                             String linkNo = vehicle.getLinkNo();
+                            String vinNo = "";
+                            if (linkNo.length() > 8) {
+                                vinNo = linkNo.substring(linkNo.length() - 8);
+                            } else {
+                                vinNo = linkNo;
+                            }
                             String busVinSid = vehicle.getSid();
                             //主方案
                             for (int i = 0; i < mainPeriod; i++) {
@@ -774,7 +801,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 mainDto.setUseOrgName(useOrgName);
                                 mainDto.setOrgSidPath(orgSidPath);
                                 mainDto.setBusVinSid(busVinSid);
-                                mainDto.setVinNo(linkNo);
+                                mainDto.setVinNo(vinNo);
                                 mainDto.setSalesUserSid(staffSid);
                                 mainDto.setStaffName(staffName);
                                 mainDto.setPolicyOrOther("0");
@@ -813,7 +840,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     otherDto.setUseOrgName(useOrgName);
                                     otherDto.setOrgSidPath(orgSidPath);
                                     otherDto.setBusVinSid(busVinSid);
-                                    otherDto.setVinNo(linkNo);
+                                    otherDto.setVinNo(vinNo);
                                     otherDto.setSalesUserSid(staffSid);
                                     otherDto.setStaffName(staffName);
                                     otherDto.setPolicyOrOther("1");
@@ -904,6 +931,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     if (!vehicles.isEmpty()) {
                         for (BusSalesOrderVehicle vehicle : vehicles) {
                             String linkNo = vehicle.getLinkNo();
+                            String vinNo = "";
+                            if (linkNo.length() > 8) {
+                                vinNo = linkNo.substring(linkNo.length() - 8);
+                            } else {
+                                vinNo = linkNo;
+                            }
                             String busVinSid = vehicle.getSid();
                             //主方案
                             for (int i = 0; i < mainPeriod; i++) {
@@ -927,7 +960,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 mainDto.setUseOrgName(useOrgName);
                                 mainDto.setOrgSidPath(orgSidPath);
                                 mainDto.setBusVinSid(busVinSid);
-                                mainDto.setVinNo(linkNo);
+                                mainDto.setVinNo(vinNo);
                                 mainDto.setSalesUserSid(staffSid);
                                 mainDto.setStaffName(staffName);
                                 mainDto.setPolicyOrOther("1");
@@ -1232,7 +1265,18 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             if (!busSalesOrderVehicles.isEmpty()) {
                 List<String> stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList());
                 if (!stringVinNos.isEmpty()) {
-                    vo.setVinNo(String.join(",", stringVinNos));
+                    List<String> vinList = new ArrayList<>();
+                    for (String linkNo : stringVinNos) {
+                        String vinNo = "";
+                        if (linkNo.length() > 8) {
+                            vinNo = linkNo.substring(linkNo.length() - 8);
+
+                        } else {
+                            vinNo = linkNo;
+                        }
+                        vinList.add(vinNo);
+                    }
+                    vo.setVinNo(String.join(",", vinList));
                 }
             }
         }