From 47f882588d1d18df404478bc79cc53cb608549a2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 22:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index e262e9e..a285034
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java
@@ -103,18 +103,27 @@
Map<String, Object> info = new HashMap<>();
info.put("carNums", carNums.toArray(new String[carNums.size()]));
info.put("communityId", tmpImportCarFees.get(0).getCommunityId());
+ info.put("statusCd", "0");
List<OwnerCarDto> ownerCarDtos = BeanConvertUtil.covertBeanList(ownerCarServiceDaoImpl.getOwnerCarInfo(info), OwnerCarDto.class);
for (OwnerCarDto ownerCarDto : ownerCarDtos) {
for (ImportRoomFee importRoomFee : tmpImportCarFees) {
- if (ownerCarDto.getNum().equals(importRoomFee.getCarNum())) {
+ if (ownerCarDto.getCarNum().equals(importRoomFee.getCarNum())) {
importRoomFee.setCarId(ownerCarDto.getCarId());
+ importRoomFee.setOwnerId(ownerCarDto.getOwnerId());
+ importRoomFee.setOwnerName(ownerCarDto.getOwnerName());
+ importRoomFee.setOwnerLink(ownerCarDto.getLink());
}
}
}
return tmpImportCarFees;
}
+ @Override
+ public long queryOwnerParkingSpaceCount(@RequestBody OwnerCarDto ownerCarDto) {
+ return ownerCarServiceDaoImpl.queryOwnerParkingSpaceCount(BeanConvertUtil.beanCovertMap(ownerCarDto));
+ }
+
public IOwnerCarServiceDao getOwnerCarServiceDaoImpl() {
return ownerCarServiceDaoImpl;
}
--
Gitblit v1.8.0