Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -40,6 +40,8 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeig
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign;
 import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords;
 import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsFeign;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
+import com.yxt.anrui.fin.api.finvehicleinvoice.VehicleInvoiceVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
@@ -97,16 +99,16 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
     @Autowired
     private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
     @Autowired
-    private BusTransferRecordsFeign busTransferRecordsFeign;
+    private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
 
     public PagerVo<LoanFileexamineVo> listPageVo(PagerQuery<LoanFileexamineQuery> pq) {
         LoanFileexamineQuery query = pq.getParams();
         QueryWrapper<LoanFileexamine> qw = new QueryWrapper<>();
         qw.eq("bl.busNo", 305);
-        if ("1".equals(query.getType())){
-            qw.eq("lf.zlState",0);
-        }else if ("2".equals(query.getType())){
-            qw.eq("lf.zlState",1);
+        if ("1".equals(query.getType())) {
+            qw.eq("lf.zlState", 0);
+        } else if ("2".equals(query.getType())) {
+            qw.eq("lf.zlState", 1);
         }
         if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
             //=======================
@@ -371,15 +373,12 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
             for (String s : stringList) {
                 hgzImages.add(s);
             }
-            BusTransferRecords busTransferRecords = busTransferRecordsFeign.selectByVinSidAndKey(busSalesOrderVehicle.getLinkSid(), "01").getData();
-            String transferFiles = busTransferRecords.getTransferFiles();
-            if (StringUtils.isNotBlank(transferFiles)){
-                String[] split = transferFiles.split(",");
-                for (String s : split) {
-                    String urlPrefix = fileUploadComponent.getUrlPrefix();
-                    s = urlPrefix + s;
-                    fpImages.add(s);
-                }
+            //发票信息
+            VehicleInvoiceVo vehicleInvoiceVo = finVehicleInvoiceFeign.selectByVinSid(busSalesOrderVehicle.getLinkSid()).getData();
+            List<String> invoiceImages = vehicleInvoiceVo.getInvoiceImages();
+            for (String s : invoiceImages) {
+                s = fileUploadComponent.getUrlPrefix() + s;
+                fpImages.add(s);
             }
         }
         vo.setHgzImages(hgzImages);
@@ -493,11 +492,11 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
     public ResultBean<LoanFileexamine> selectOrderSidAndContract(String saleOrderSid, String loanContractSid) {
         ResultBean<LoanFileexamine> rb = ResultBean.fireFail();
         //根据销售订单sid和消贷合同sid查询信息
-        if(StringUtils.isBlank(loanContractSid)){
+        if (StringUtils.isBlank(loanContractSid)) {
             return rb;
         }
-        LoanFileexamine loanFileexamine = baseMapper.selectOrderSidAndContract(saleOrderSid,loanContractSid);
-        if(loanFileexamine == null){
+        LoanFileexamine loanFileexamine = baseMapper.selectOrderSidAndContract(saleOrderSid, loanContractSid);
+        if (loanFileexamine == null) {
             return rb;
         }
         return rb.success().setData(loanFileexamine);