包租

src/main/java/com/qmrb/system/controller/OrderController.java

@@ -395,13 +395,13 @@ public class OrderController extends CommonController {
         } else if (formData != null && pendingAmount.compareTo(BigDecimal.ZERO) <= 0) {
             if(StringUtils.isBlank(fetchVehicle)){
                 log.info("未扫码取车");
-                return CommonResult.failed("请重新扫码后取车！");
+                return CommonResult.failed("请扫取车码！");
             }
             // 取车前校验是否现场扫码
             Object token = redisTemplate.opsForValue().get(fetchVehicle);
             if(token == null){
                 log.info("请扫码后取车,{}",(Long) token);
-                return CommonResult.failed("请重新扫码后取车！");
+                return CommonResult.failed("请扫取车码！");
             }
             HashMap<String, Object> paramsMap = new HashMap<>();
             paramsMap.put("channelId", formData.getBarnId());

src/main/java/com/qmrb/system/service/impl/ContractPlaceNumberRelServiceImpl.java

@@ -418,6 +418,7 @@ public class ContractPlaceNumberRelServiceImpl extends ServiceImpl<ContractPlace
                 contractPlaceNumberRel.setStartTime(startTime);
                 contractPlaceNumberRel.setEndTime(endTime);
                 contractPlaceNumberRel.setContractId(contractId);
+                contractPlaceNumberRel.setCarType(StrUtil.equals(iter.getSlotType(),"large") ? "1":"2");
                 currentDayContractPlaceNumberRels.add(contractPlaceNumberRel);
             }
         });

src/main/java/com/qmrb/system/service/impl/ContractServiceImpl.java

@@ -169,7 +169,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
 
         Contract entity = converter.form2Entity(form);
         // 保存虚拟车位
-        if(form.getMaxParkingLotNum()!= null && contract.getMaxParkingLotNum() != null && !form.getMaxParkingLotNum().equals(contract.getMaxParkingLotNum())){
+        if(form.getMaxParkingLotNum()!= null && contract.getMaxParkingLotNum() != null && !form.getMaxParkingLotNum().equals(contract.getMaxParkingLotNum()) &&
+        form.getSmallParkingLotNum()!= null && contract.getSmallParkingLotNum() != null && !form.getSmallParkingLotNum().equals(contract.getSmallParkingLotNum()) 
+        ){
             virtualParkingSlotService.createFormsByContract(entity);
         }
         

src/main/java/com/qmrb/system/service/impl/OrderServiceImpl.java

@@ -153,6 +153,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 return item;
             }).collect(Collectors.toList());
             pageResult.setRecords(list);
+            pageResult.setTotal(list.size());
         }
         return pageResult;
     }

src/main/java/com/qmrb/system/service/impl/VirtualParkingSlotServiceImpl.java

@@ -112,6 +112,9 @@ public class VirtualParkingSlotServiceImpl extends ServiceImpl<VirtualParkingSlo
 					// 	todo 如果已停车，是否释放
 					this.updateBatchById(outVirtuals);
 				}
+				updateSlotType(list,contract);
+				this.updateBatchById(list);
+				
 			}else if(contract.getMaxParkingLotNum()>list.size() && contract.getMaxParkingLotNum() < allVirtuals.size()){
 				ArrayList<VirtualParkingSlot> virtualParkingSlots = new ArrayList<>();
 				// 如果包租协议最大车位数大于启用虚拟车位，但小于总虚拟车位
@@ -122,7 +125,11 @@ public class VirtualParkingSlotServiceImpl extends ServiceImpl<VirtualParkingSlo
 					return iter;
 				}).collect(Collectors.toList());
 				log.info("2==============>:{}",outVirtuals.size());
-				this.updateBatchById(outVirtuals);
+				// this.updateBatchById(outVirtuals);
+
+				list.addAll(outVirtuals);
+				updateSlotType(list,contract);
+				this.updateBatchById(list);
 				
 			}else if(contract.getMaxParkingLotNum() > allVirtuals.size()){
 				// 如果包租协议最大车位数大于启用虚拟车位，但小于总虚拟车位
@@ -147,7 +154,9 @@ public class VirtualParkingSlotServiceImpl extends ServiceImpl<VirtualParkingSlo
 				list.addAll(newVirtuals);
 				list.sort((s1, s2) -> s1.getVirtualSlotNumber().compareTo(s2.getVirtualSlotNumber()));
 				log.info("3==============>:{}",list.size());
+				updateSlotType(list,contract);
 				this.saveOrUpdateBatch(list);
+				// this.saveOrUpdateBatch(list);
 			}
 		}else{
 			// 首次创建包租协议，初始化虚拟车位
@@ -158,6 +167,11 @@ public class VirtualParkingSlotServiceImpl extends ServiceImpl<VirtualParkingSlo
 				VirtualParkingSlot virtualParkingSlot = new VirtualParkingSlot();
 				virtualParkingSlot.setContractId(contract.getId());
 				virtualParkingSlot.setVirtualSlotNumber("A"+index);
+				if(i >= contract.getSmallParkingLotNum()){
+					virtualParkingSlot.setSlotType("large");
+				}else{
+					virtualParkingSlot.setSlotType("small");
+				}
 				list.add(virtualParkingSlot);
 				index ++;
 			}
@@ -166,6 +180,16 @@ public class VirtualParkingSlotServiceImpl extends ServiceImpl<VirtualParkingSlo
 		}
 	}
 
+	public void updateSlotType(List<VirtualParkingSlot> list,Contract contract){
+		for (int i = 0; i < list.size(); i++) {
+			if(i < contract.getSmallParkingLotNum()){
+				list.get(i).setSlotType("small");
+			}else{
+				list.get(i).setSlotType("large");
+			}
+		}
+		
+	}
 	/**更新
 	 * */
 	@Override