优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -20,6 +20,7 @@ import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
@@ -777,7 +778,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         //车架号发生变化，重新生成新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、
         //回购日期发生变化，重新生成欠款提车担保承诺书
         if (StringUtils.isBlank(sid)) {
-         /*   //生成新车买卖合同（欠款）
+           /* //生成新车买卖合同（欠款）
             carContractDownloadUrl = carContractDownloadUrl(dto, map);
             //生成欠款提车担保承诺书
             guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
@@ -1280,13 +1281,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 }
             }
             map.put("address", address);
-            //组装到文档相对应的字段中
-            if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
-                ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
-                if (invoicingDetailsVoResultBean.getData() != null) {
-                    map.put("orgName", invoicingDetailsVoResultBean.getData().getName());
-                    map.put("useOrgName",invoicingDetailsVoResultBean.getData().getName());
-                }
+            ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(dto.getContractId());
+            if(commonContractResultBean.getData() != null){
+                map.put("orgName", commonContractResultBean.getData().getPartyA());
+                map.put("useOrgName",commonContractResultBean.getData().getPartyA());
             }
             map.put("mobile", appOrderDetailsVo.getPhone());
             ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());