diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 9a18738121..e65aa30601 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1870,7 +1870,7 @@ public class CommonContractService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); if("1".equals(appOrderDetailsVo.getPayTypeKey())){//全款 - /*Future future1 = pool.submit(() -> { + /* Future future1 = pool.submit(() -> { return genCarSaleContract(dto, map, appOrderDetailsVo); }); Future future1_2 = pool.submit(() -> { diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl index 49683090af..8a4c2eb5f2 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl @@ -715,7 +715,7 @@ - 贵公司授权的 + 贵公司授权 @@ -749,7 +749,7 @@ - ${payTypp!} + ${payTypp!} @@ -770,7 +770,7 @@ - 车款 + 账户的 @@ -779,7 +779,7 @@ - ${money!} + ${money!} @@ -796,7 +796,7 @@ - : + diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl index 2a16b019e0..6bf5faf7e9 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl @@ -895,7 +895,7 @@ - 日转入贵公司或贵公司授权的 + 日转入贵公司或贵公司授权 @@ -951,7 +951,7 @@ - + 账户的 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl index 7c5af24711..98d1791092 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl @@ -1122,7 +1122,7 @@ - 的《车辆买卖合同》 + 的《新车买卖合同》 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 77e5e3afe6..bad6fdfea4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -111,6 +111,7 @@ import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleServ import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService; import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicleDemandOrderVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign; @@ -3782,6 +3783,14 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = getSaleOrderDetails(busSaleOrderVehicleOutVo.getSalesOrderSid()); diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 6c6e603647..1e5a4ff383 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -824,7 +824,7 @@ public class CrmCustomerTempService extends MybatisBaseService