From dab6dd6a65faae3b061f5890792dd657f638dede Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 29 Jul 2022 09:38:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busvehicleorder/BusVehicleOrderMapper.xml  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
index a55a129a61..cbee927d56 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
@@ -203,12 +203,12 @@
     </select>
 
     <select id="getContractPrice" resultType="java.lang.String">
-        SELECT bvad.contractPrice
-        FROM anrui_base.bus_vehicle_apply_detail bvad
-                     LEFT JOIN anrui_base.bus_vehicle_order bvo
-                ON bvad.`sid` = bvo.purchaseApplyMediumModelSid
-                     LEFT JOIN anrui_scm.`scm_apply_inbound` sai
-                ON sai.vehicleOrderSid = bvo.`sid`
-        WHERE bvad.applySid = #{sid}
+        SELECT
+                bvad.contractPrice
+        FROM
+                anrui_base.bus_vehicle_apply_detail bvad
+                        LEFT JOIN anrui_base.bus_vehicle_order bvo
+                        ON bvad.`sid` = bvo.purchaseApplyMediumModelSid
+        WHERE bvad.sid = #{sid}
     </select>
 </mapper>
\ No newline at end of file

From 20535fd7b2557a89c5c765978595fb2453231578 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 29 Jul 2022 09:47:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java     | 2 +-
 .../com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
index 97b2c0b0d2..cb56a17450 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
@@ -106,7 +106,7 @@ public class BaseVehicleDto implements Dto {
     @ApiModelProperty(value = "运费")
     private Integer freight;
     @ApiModelProperty(value = "合格证状态key")
-    private String certificateState = "0001";
+    private String certificateState = "001";
     @ApiModelProperty(value = "合格证状态value")
     private String certificateStateValue = "虚拟";
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
index e4faf9dfc8..c3002a0a0d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
@@ -121,6 +121,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             baseVehicleCertificate.setVinNo(dto.getVinNo());
             baseVehicleCertificate.setCertificateState(dto.getCertificateState());
             baseVehicleCertificate.setCertificateStateValue(dto.getCertificateStateValue());
+            baseVehicleCertificate.setVehicleSid(baseVehicle.getSid());
+            baseVehicleCertificate.setTransferStateKey("001");
+            baseVehicleCertificate.setTransferStateValue("未接收");
             baseVehicleCertificateService.save(baseVehicleCertificate);
         }else {
             return rb.setMsg("车架号不能为空");