From 5419ea4f4c358f4bda8476f5248b43e556c8ee00 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 27 十一月 2022 23:38:55 +0800
Subject: [PATCH] 加入手工赠送优惠券 功能
---
springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerCarSMOImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerCarSMOImpl.java b/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerCarSMOImpl.java
index 4432c0d..cf9db40 100644
--- a/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerCarSMOImpl.java
+++ b/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerCarSMOImpl.java
@@ -138,7 +138,7 @@
importOwnerCar.setOwnerName(os[5].toString());
//鑾峰彇杞︿綅
String parkingLot = os[6].toString();
- String[] split = parkingLot.split("-",2);
+ String[] split = parkingLot.split("-");
importOwnerCar.setAreaNum(split[0]);
importOwnerCar.setNum(split[1]);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -185,30 +185,30 @@
floorDto.setFloorNum(floorNum);
//鏌ヨ妤兼爧
List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors(floorDto);
- Assert.listOnlyOne(floorDtos, "鏌ヨ妤兼爧閿欒锛�");
+ Assert.listOnlyOne(floorDtos, ownerCarDto.getCarNum()+"鏌ヨ妤兼爧閿欒锛�");
UnitDto unitDto = new UnitDto();
unitDto.setUnitNum(unitNum);
unitDto.setFloorId(floorDtos.get(0).getFloorId());
//鏌ヨ鍗曞厓
List<UnitDto> unitDtos = unitInnerServiceSMOImpl.queryUnits(unitDto);
- Assert.listOnlyOne(unitDtos, "鏌ヨ鍗曞厓閿欒锛�");
+ Assert.listOnlyOne(unitDtos, ownerCarDto.getCarNum()+"鏌ヨ鍗曞厓閿欒锛�");
RoomDto roomDto = new RoomDto();
roomDto.setRoomNum(roomNum);
roomDto.setUnitId(unitDtos.get(0).getUnitId());
//鏌ヨ鎴垮眿
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
- Assert.listOnlyOne(roomDtos, "鏌ヨ鎴垮眿閿欒锛�");
+ Assert.listOnlyOne(roomDtos, ownerCarDto.getCarNum()+"鏌ヨ鎴垮眿閿欒锛�");
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
ownerRoomRelDto.setRoomId(roomDtos.get(0).getRoomId());
//鏌ヨ涓氫富鎴垮眿鍏崇郴琛�
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- Assert.listOnlyOne(ownerRoomRelDtos, "鏌ヨ涓氫富鎴垮眿淇℃伅閿欒锛�");
+ Assert.listOnlyOne(ownerRoomRelDtos, ownerCarDto.getCarNum()+"鏌ヨ涓氫富鎴垮眿淇℃伅閿欒锛�");
OwnerDto ownerDto = new OwnerDto();
ownerDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
ownerDto.setName(ownerCarDto.getOwnerName());
//鏌ヨ涓氫富
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
- Assert.listOnlyOne(ownerDtos, "鏌ヨ涓氫富淇℃伅閿欒锛�");
+ Assert.listOnlyOne(ownerDtos, ownerCarDto.getCarNum()+"鏌ヨ涓氫富淇℃伅閿欒锛�");
if (ownerDtos.get(0).getOwnerTypeCd().equals("1001")) { //涓氫富
ownerCarPo.setCarTypeCd("1001"); //涓氫富杞﹁締
} else {
@@ -267,9 +267,7 @@
ownerCarPo.setCarId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_carId));
ownerCarPo.setMemberId(ownerCarPo.getCarId());
ownerCarPo.setState("1001"); //1001 姝ｅ父鐘舵�侊紝2002 杞︿綅閲婃斁娆犺垂鐘舵�侊紝3003 杞︿綅閲婃斁
- //ownerCarPo.setLeaseType(OwnerCarDto.LEASE_TYPE_MONTH);
ownerCarPo.setLeaseType(ownerCarDto.getSpaceSate());
-
ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
parkingSpacePo.setPsId(psId); //杞︿綅id
@@ -302,3 +300,4 @@
return tDate;
}
}
+
--
Gitblit v1.8.0