diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
index 3748a4b0ff..ea4d4330ec 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
@@ -227,6 +227,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
     public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
         ResultBean<AppDeliveredDetailsVo> rb = ResultBean.fireFail();
         AppDeliveredDetailsVo appDeliveredDetailsVo = new AppDeliveredDetailsVo();
+        boolean codeMsg = false;
         if (StringUtils.isBlank(query.getOutboundSid())) {
             appDeliveredDetailsVo.setOrgPath(query.getOrgPath());
             List<String> list = query.getList();
@@ -436,40 +437,55 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             }
             List<AppCarListVo> carList = new ArrayList<>();
             List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid());
-            for (int i = 0; i < detailsList.size(); i++) {
-                BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
-                AppCarListVo appCarListVo = new AppCarListVo();
-                appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
-                appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
-                //查询该车辆是否有挂车
-                ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(),busDeliveredApply.getContractNo());
-                if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
-                    appCarListVo.setShowHandCarBtn(false);
-                } else {
-                    appCarListVo.setShowHandCarBtn(true);
+            detailsList.removeAll(Collections.singleton(null));
+            if(!detailsList.isEmpty()){
+                for (int i = 0; i < detailsList.size(); i++) {
+                    BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
+                    AppCarListVo appCarListVo = new AppCarListVo();
+                    appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
+                    appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
+                    //查询该车辆是否有挂车
+                    ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(),busDeliveredApply.getContractNo());
+                    if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
+                        appCarListVo.setShowHandCarBtn(false);
+                    } else {
+                        appCarListVo.setShowHandCarBtn(true);
+                    }
+                    //优惠包使用情况
+                    List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
+                    List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());
+                    for (int j = 0; j < discountsList.size(); j++) {
+                        BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountsList.get(j);
+                        BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
+                        busDeliveredDetailsDiscountsVo.setDiscountSid(busDeliveredDetailsDiscount.getDiscountSid());
+                        busDeliveredDetailsDiscountsVo.setDiscountName(busDeliveredDetailsDiscount.getName());
+                        busDeliveredDetailsDiscountsVo.setDiscountNum(busDeliveredDetailsDiscount.getGiveNum());
+                        busDeliveredDetailsDiscountsVo.setDiscountInfo(busDeliveredDetailsDiscount.getDiscountExplain());
+                        busDeliveredDetailsDiscountsVo.setDiscountPrice(busDeliveredDetailsDiscount.getPrice());
+                        busDeliveredDetailsDiscountsVo.setTotalNum(busDeliveredDetailsDiscount.getNum());
+                        //已使用的数量：根据优惠包sid查询出库已提交以及出库已办结的数量
+                        int intCount = busDeliveredDetailsDiscountService.selectCounts(busDeliveredDetailsDiscount.getDiscountSid());
+                        int count = busDeliveredDetailsDiscount.getNum();
+                        //剩余数量
+                        int discountLeaveNum = count - intCount;
+                        if(discountLeaveNum<busDeliveredDetailsDiscount.getGiveNum()){
+                            codeMsg = true;
+                            busDeliveredDetailsDiscountsVo.setDiscountNum(0);
+                        }
+                        discountUse.add(busDeliveredDetailsDiscountsVo);
+                    }
+                    appCarListVo.setDiscountUse(discountUse);
+                    //使用人信息
+                    BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
+                    BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage();
+                    if("2".equals(busDeliveredApply.getTypeKey())){
+                        busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
+                        BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
+                    }
+                    realBuyer.setVin(busDeliveredApplyDetails.getVinNo());
+                    appCarListVo.setRealBuyer(realBuyer);
+                    carList.add(appCarListVo);
                 }
-                //优惠包使用情况
-                List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
-                List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());
-                for (int j = 0; j < discountsList.size(); j++) {
-                    BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountsList.get(j);
-                    BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
-                    busDeliveredDetailsDiscountsVo.setDiscountSid(busDeliveredDetailsDiscount.getDiscountSid());
-                    busDeliveredDetailsDiscountsVo.setDiscountName(busDeliveredDetailsDiscount.getName());
-                    busDeliveredDetailsDiscountsVo.setDiscountNum(busDeliveredDetailsDiscount.getGiveNum());
-                    busDeliveredDetailsDiscountsVo.setDiscountInfo(busDeliveredDetailsDiscount.getDiscountExplain());
-                    busDeliveredDetailsDiscountsVo.setDiscountPrice(busDeliveredDetailsDiscount.getPrice());
-                    busDeliveredDetailsDiscountsVo.setTotalNum(busDeliveredDetailsDiscount.getNum());
-                    discountUse.add(busDeliveredDetailsDiscountsVo);
-                }
-                appCarListVo.setDiscountUse(discountUse);
-                //使用人信息
-                BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
-                BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
-                BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
-                realBuyer.setVin(busDeliveredApplyDetails.getVinNo());
-                appCarListVo.setRealBuyer(realBuyer);
-                carList.add(appCarListVo);
             }
             appDeliveredDetailsVo.setCarList(carList);
             //剩余
@@ -528,6 +544,9 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         vo.setCarList(appCarListVos);
         vo.setTerminalKey("0");
         vo.setTerminalValue("否");*/
+        if(codeMsg){
+            return rb.success().setData(appDeliveredDetailsVo).setCode("20005");
+        }
         return rb.success().setData(appDeliveredDetailsVo);
     }
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index a941165a59..abdbd88fa9 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -1324,40 +1324,43 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         List<AppCarListVo> carList = new ArrayList<>();
         List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid);
-        for (int i = 0; i < detailsList.size(); i++) {
-            BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
-            AppCarListVo appCarListVo = new AppCarListVo();
-            appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
-            appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
-            //查询该车辆是否有挂车
-            ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo());
-            if (trailerList.getData().getList().isEmpty()) {
-                appCarListVo.setShowHandCarBtn(false);
-            } else {
-                appCarListVo.setShowHandCarBtn(true);
-            }
-            //优惠包使用情况
-            List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
-            List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());
-            for (int j = 0; j < discountsList.size(); j++) {
-                BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountsList.get(j);
-                BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
-                busDeliveredDetailsDiscountsVo.setDiscountSid(busDeliveredDetailsDiscount.getDiscountSid());
-                busDeliveredDetailsDiscountsVo.setDiscountName(busDeliveredDetailsDiscount.getName());
-                busDeliveredDetailsDiscountsVo.setDiscountNum(busDeliveredDetailsDiscount.getGiveNum());
-                busDeliveredDetailsDiscountsVo.setDiscountInfo(busDeliveredDetailsDiscount.getDiscountExplain());
-                busDeliveredDetailsDiscountsVo.setDiscountPrice(busDeliveredDetailsDiscount.getPrice());
-                busDeliveredDetailsDiscountsVo.setTotalNum(busDeliveredDetailsDiscount.getNum());
-                discountUse.add(busDeliveredDetailsDiscountsVo);
+        detailsList.removeAll(Collections.singleton(null));
+        if(!detailsList.isEmpty()){
+            for (int i = 0; i < detailsList.size(); i++) {
+                BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
+                AppCarListVo appCarListVo = new AppCarListVo();
+                appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
+                appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
+                //查询该车辆是否有挂车
+                ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo());
+                if (trailerList.getData().getList().isEmpty()) {
+                    appCarListVo.setShowHandCarBtn(false);
+                } else {
+                    appCarListVo.setShowHandCarBtn(true);
+                }
+                //优惠包使用情况
+                List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
+                List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());
+                for (int j = 0; j < discountsList.size(); j++) {
+                    BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountsList.get(j);
+                    BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
+                    busDeliveredDetailsDiscountsVo.setDiscountSid(busDeliveredDetailsDiscount.getDiscountSid());
+                    busDeliveredDetailsDiscountsVo.setDiscountName(busDeliveredDetailsDiscount.getName());
+                    busDeliveredDetailsDiscountsVo.setDiscountNum(busDeliveredDetailsDiscount.getGiveNum());
+                    busDeliveredDetailsDiscountsVo.setDiscountInfo(busDeliveredDetailsDiscount.getDiscountExplain());
+                    busDeliveredDetailsDiscountsVo.setDiscountPrice(busDeliveredDetailsDiscount.getPrice());
+                    busDeliveredDetailsDiscountsVo.setTotalNum(busDeliveredDetailsDiscount.getNum());
+                    discountUse.add(busDeliveredDetailsDiscountsVo);
+                }
+                appCarListVo.setDiscountUse(discountUse);
+                //使用人信息
+                BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
+                BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
+                BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
+                realBuyer.setVin(busDeliveredApplyDetails.getVinNo());
+                appCarListVo.setRealBuyer(realBuyer);
+                carList.add(appCarListVo);
             }
-            appCarListVo.setDiscountUse(discountUse);
-            //使用人信息
-            BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
-            BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
-            BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
-            realBuyer.setVin(busDeliveredApplyDetails.getVinNo());
-            appCarListVo.setRealBuyer(realBuyer);
-            carList.add(appCarListVo);
         }
         appDeliveredDetailsVo.setCarList(carList);
         //获取实际购车人的数据
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 2ca411173d..6e9b6efffb 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
@@ -580,7 +580,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         List<String> stringList = new ArrayList<>();
                         if (!list.isEmpty()) {
                             for (BusDepositFictitiousDetailsVo v : list) {
-                                String b = "编号为" + v.getDepositBillNo() + "虚拟订单订金转入" + v.getPrice() + "元，";
+                                String b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元，";
                                 a = a + b;
                                 if (StringUtils.isNotBlank(v.getPayPath())) {
                                     List<String> payPathList = Arrays.asList(v.getPayPath().split(","));
@@ -3331,7 +3331,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 List<String> stringList = new ArrayList<>();
                 if (!list.isEmpty()) {
                     for (BusDepositFictitiousDetailsVo v : list) {
-                        String b = "编号为" + v.getDepositBillNo() + "虚拟订单订金转入" + v.getPrice() + "元，";
+                        String b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元，";
                         a = a + b;
                         if (StringUtils.isNotBlank(v.getPayPath())) {
                             List<String> payPathList = Arrays.asList(v.getPayPath().split(","));