问题修改

2 years ago · df24df027a
6 changed files with 19 additions and 10 deletions
--- 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<CommonContractMapp
                    0L, TimeUnit.MILLISECONDS,
                    new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
            if("1".equals(appOrderDetailsVo.getPayTypeKey())){//全款
-                /*Future<String> future1 = pool.submit(() -> {
+               /* Future<String> future1 = pool.submit(() -> {
                    return genCarSaleContract(dto, map, appOrderDetailsVo);
                });
                Future<String> future1_2 = pool.submit(() -> {
--- 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 @@
                        <w:sz w:val="28"/>
                        <w:sz-cs w:val="28"/>
                    </w:rPr>
-                    <w:t>贵公司授权的</w:t>
+                    <w:t>贵公司授权</w:t>
                </w:r>
                <w:r>
                    <w:rPr>
@ -749,7 +749,7 @@
                        <w:sz-cs w:val="28"/>
                        <w:u w:val="single"/>
                    </w:rPr>
-                    <w:t>${payTypp!}</w:t>
+                    <w:t>   ${payTypp!}     </w:t>
                </w:r>
                <w:proofErr w:type="spellEnd"/>
                <w:r>
@ -770,7 +770,7 @@
                        <w:sz w:val="28"/>
                        <w:sz-cs w:val="28"/>
                    </w:rPr>
-                    <w:t>车款</w:t>
+                    <w:t>账户的</w:t>
                </w:r>
                <w:r>
                    <w:rPr>
@ -779,7 +779,7 @@
                        <w:sz-cs w:val="28"/>
                        <w:u w:val="single"/>
                    </w:rPr>
-                    <w:t>             ${money!}      </w:t>
+                    <w:t>   ${money!}   </w:t>
                </w:r>
                <w:r>
                    <w:rPr>
@ -796,7 +796,7 @@
                        <w:sz w:val="28"/>
                        <w:sz-cs w:val="28"/>
                    </w:rPr>
-                    <w:t>:</w:t>
+                    <w:t>：</w:t>
                </w:r>
                <w:r>
                    <w:rPr>
--- 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 @@
                        <w:sz w:val="28"/>
                        <w:sz-cs w:val="28"/>
                    </w:rPr>
-                    <w:t>日转入贵公司或贵公司授权的</w:t>
+                    <w:t>日转入贵公司或贵公司授权</w:t>
                </w:r>
                <w:r wsp:rsidR="00166DD5">
                    <w:rPr>
@ -951,7 +951,7 @@
                        <w:sz w:val="28"/>
                        <w:sz-cs w:val="28"/>
                    </w:rPr>
-                    <w:t>的</w:t>
+                    <w:t>账户的</w:t>
                </w:r>
                <w:r>
                    <w:rPr>
--- 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 @@
                        <w:sz w:val="28"/>
                        <w:sz-cs w:val="28"/>
                    </w:rPr>
-                    <w:t>的《车辆买卖合同》</w:t>
+                    <w:t>的《新车买卖合同》</w:t>
                </w:r>
                <w:r>
                    <w:rPr>
--- 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<BusSalesOrderMapper
        if (busSaleOrderVehicleOutVo == null) {
            return rb.success().setData(busSaleOrderVehicleOutVo);
        }
+        //根据客户sid查询客户编码
+        if(StringUtils.isNotBlank(busSaleOrderVehicleOutVo.getCustomerSid())){
+            //根据客户sid查询客户编码
+            CrmCustomerTempVo crmCustomerTemp = crmCustomerTempFeign.fetchSid(busSaleOrderVehicleOutVo.getCustomerSid()).getData();
+            if(crmCustomerTemp != null){
+                busSaleOrderVehicleOutVo.setCustomerNo(crmCustomerTemp.getCustomerNo());
+            }
+        }
        //根据销售订单sid查询优惠价值
        //查询销售销售订单的单台销售折让
        ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(busSaleOrderVehicleOutVo.getSalesOrderSid());
--- 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<CrmCustomerTempMa
            CrmCustomerTemp customerTemp = saveCrmCustomerTemp(dto, sysUserVo);
            sid = customerTemp.getSid();
        }
-        return rb.success().setData(crmCustomerTemp.getSid());
+        return rb.success().setData(sid);
    }

    /**