From e20b46f2ed785e2b542b6592bd3c9abf22e27b05 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 18 Jul 2023 09:54:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=BA=93=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AD=90=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDeliveredApplyDetails.java                    |  2 ++
 .../BusDeliveredApplyDetailsService.java             | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetails.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetails.java
index 600dc39700..56fb465f6d 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetails.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetails.java
@@ -67,4 +67,6 @@ public class BusDeliveredApplyDetails extends BaseEntity {
     @ApiModelProperty("赠送套餐")
     private String discountAll;
 
+    private String busVinSid;
+
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
index 45767dc9ef..91c8295234 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
@@ -30,12 +30,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.*;
 import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscount;
 import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountDto;
 import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.biz.busdeliveredapply.BusDeliveredApplyService;
 import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService;
 import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
+import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -70,6 +74,10 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
     private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
     @Autowired
     private BusDeliveredDetailsDiscountService busDeliveredDetailsDiscountService;
+    @Autowired
+    private BusSalesOrderVehicleService busSalesOrderVehicleService;
+    @Autowired
+    private BusDeliveredApplyService busDeliveredApplyService;
 
     private QueryWrapper<BusDeliveredApplyDetails> createQueryWrapper(BusDeliveredApplyDetailsQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -115,6 +123,7 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
     }
 
     public void saveList(List<BusDeliveredApplyDetailsDto> dtoList, String sid) {
+        BusDeliveredApply busDeliveredApply = busDeliveredApplyService.fetchBySid(sid);
         //删除该出库的车辆以及优惠
         baseMapper.deleteByApplySid(sid);
         busDeliveredUseMessageService.deleteByApplySid(sid);
@@ -124,6 +133,9 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
             BusDeliveredApplyDetails busDeliveredApplyDetails = new BusDeliveredApplyDetails();
             BeanUtil.copyProperties(busDeliveredApplyDetailsDto, busDeliveredApplyDetails, "sid");
             busDeliveredApplyDetails.setApplySid(sid);
+            //根据合同编号和车架号查询busVinSId
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),busDeliveredApplyDetailsDto.getVinSid());
+            busDeliveredApplyDetails.setBusVinSid(busSalesOrderVehicle.getSid());
             //保存使用人信息
             if (dtoList.get(i).getUseMessage() != null) {
                 BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage();