From 955ec5428a6dd2546cf0d547812bf72c9e3c5e86 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 1 Sep 2022 15:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java | 3 +++
 .../base/api/busvehicleapply/BusVehicleApplyDetailsVo.java  | 2 ++
 .../anrui/base/api/busvehicleapply/BusVehicleApplyDto.java  | 3 +++
 .../base/api/busvehicleapply/app/AppVehicleApplyVo.java     | 2 ++
 .../BaseVehicleActualSalesService.java                      | 6 ++++++
 .../base/biz/busvehicleapply/BusVehicleApplyMapper.xml      | 3 ++-
 6 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
index 09571ec403..c745e4bdd5 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
@@ -61,4 +61,7 @@ public class BusVehicleApply extends BaseEntity {
     @ApiModelProperty("采购类型value")
     private String applyType;
 
+    @ApiModelProperty("订金付款备注")
+    private String payRemarks;
+
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
index 4d27191732..d7f42a05b6 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
@@ -51,4 +51,6 @@ public class BusVehicleApplyDetailsVo implements Vo {
 
     private String applyTypeKey;
     private String applyType;
+    @ApiModelProperty("订金付款备注")
+    private String payRemarks;
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
index c8f02b1656..1bff98a3f3 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
@@ -64,4 +64,7 @@ public class BusVehicleApplyDto implements Dto {
     @ApiModelProperty("采购类型value")
     private String applyType;
 
+    @ApiModelProperty("订金付款备注")
+    private String payRemarks;
+
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java
index 1e700b32c1..58b5b54cb1 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java
@@ -46,4 +46,6 @@ public class AppVehicleApplyVo implements Vo {
 
     @ApiModelProperty(value = "采购类型")
     private String applyType;
+    @ApiModelProperty("订金付款备注")
+    private String payRemarks;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
index 78411e5cb8..b35fd5b1fe 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
@@ -555,6 +555,12 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                     return rb.setMsg(resultBean.getMsg());
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                if(query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())){
+                    //更新车辆状态为未买断
+                    String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
+                    String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
+                    updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
+                }
                 return rb.success().setData(resultBean.getData());
             }
         }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
index 56107573c1..1c8810a68f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
@@ -73,7 +73,8 @@
                ba.taskId,
                ba.createOrgSid as userSid,
                ba.createOrgName,
-               ba.applyType
+               ba.applyType,
+               ba.payRemarks
         from bus_vehicle_apply ba
         where sid = #{sid}
     </select>