收款单推送修改贷款部分

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -76,9 +76,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQuery;
-import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo;
-import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryMaterial;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.HanZiConverterPinYin;
@@ -1197,16 +1194,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName());
         List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
         for (AppFinUncollectedReceivablesDetailedVo record : records) {
-//            record.setReceivable(record.getConfirmMoney());
             record.setConfirmDate(dateFormat.format(new Date()));
             String busVinSid = record.getBusVinSid();
             ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
             if (resultBean.getData() != null) {
                 String vinNo = resultBean.getData().getLinkNo();
                 String vinSid = resultBean.getData().getLinkSid();
+                String temporaryNo = resultBean.getData().getTemporaryNo();
                 record.setVin(vinNo);
                 if (StringUtils.isNotBlank(vinNo)) {
                     record.setVin(vinNo.substring(vinNo.length() - 8));
+                }else{
+                    if("2".equals(record.getPayTypeKey())){
+                        record.setVin(temporaryNo.substring(temporaryNo.length()-2));
+                    }
                 }
             }
         }
@@ -1596,7 +1597,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (finSelectedReceivablesDetailedVos1_1.size() > 0) {
             for (int i = 0; i < finSelectedReceivablesDetailedVos1_1.size(); i++) {
                 FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1.get(i);
-                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), vvvv.getVIN(), sid);
+                String customerNum = vvvv.getContractNo()+vvvv.getVIN();
+                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), customerNum, sid);
                 //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
                 if (data != null){
                     bdCustomer.setTOrgIds(data.getOrgCode());
@@ -1649,7 +1651,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             for (int i = 0; i < finSelectedReceivablesDetailedVos2_1.size(); i++) {
                 FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos2_1.get(i);
                 //先推送客户
-                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), vvvv.getVIN(), sid);
+                String customerNum = vvvv.getContractNo()+vvvv.getVIN();
+                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), customerNum, sid);
                 //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
                 if (data != null){
                     bdCustomer.setTOrgIds(data.getOrgCode());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -177,7 +177,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                         v.setVIN(vinNo.substring(vinNo.length()-8));
                     }else{
                         if("2".equals(v.getPayTypeKey())){
-                            v.setVIN(temporaryNo);
+                            v.setVIN(temporaryNo.substring(temporaryNo.length()-2));
                         }
                     }
                 }