出库相关

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,6 +437,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             }
             List<AppCarListVo> carList = new ArrayList<>();
             List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid());
+            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();
@@ -460,17 +463,30 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                         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 = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
+                    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);
                 }
+            }
             appDeliveredDetailsVo.setCarList(carList);
             //剩余
             List<DeliveredLeavesVo> discountLeave = new ArrayList<>();
@@ -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);
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -1324,6 +1324,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         List<AppCarListVo> carList = new ArrayList<>();
         List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid);
+        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();
@@ -1359,6 +1361,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 appCarListVo.setRealBuyer(realBuyer);
                 carList.add(appCarListVo);
             }
+        }
         appDeliveredDetailsVo.setCarList(carList);
         //获取实际购车人的数据
         ResultBean<List<DictCommonVo>> listResultBean = dictCommonFeign.getTypeValues("buyerType", "0");

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(","));