From 0a9b6e565843bd25e5ef37e979c7da9bbf3df218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 四月 2022 17:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 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..c082abe
--- 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
@@ -5,6 +5,7 @@
import com.java110.dto.PageDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.user.UserDto;
+import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
@@ -103,18 +104,58 @@
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;
}
+ public List<ImportCustomCreateFeeDto> freshCarIdsByImportCustomCreateFee(@RequestBody List<ImportCustomCreateFeeDto> tmpImportCarFees){
+ List<String> carNums = new ArrayList<>();
+ for (ImportCustomCreateFeeDto importRoomFee : tmpImportCarFees) {
+ if (StringUtil.isEmpty(importRoomFee.getCarNum())) {
+ continue;
+ }
+ carNums.add(importRoomFee.getCarNum());
+ }
+
+ if (carNums.size() < 1) {
+ return tmpImportCarFees;
+ }
+ 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 (ImportCustomCreateFeeDto importRoomFee : tmpImportCarFees) {
+ if (ownerCarDto.getCarNum().equals(importRoomFee.getCarNum())) {
+ importRoomFee.setPayObjId(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