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 | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 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 d1037cf..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
@@ -1,20 +1,24 @@
package com.java110.user.smo.impl;
-import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.user.UserDto;
+import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
-import com.java110.dto.owner.OwnerCarDto;
-import com.java110.dto.PageDto;
-import com.java110.dto.user.UserDto;
import com.java110.user.dao.IOwnerCarServiceDao;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @ClassName FloorInnerServiceSMOImpl
@@ -83,6 +87,43 @@
return ownerCarServiceDaoImpl.queryOwnerCarsCount(BeanConvertUtil.beanCovertMap(ownerCarDto));
}
+ @Override
+ public List<ImportRoomFee> freshCarIds(@RequestBody List<ImportRoomFee> tmpImportCarFees) {
+ List<String> carNums = new ArrayList<>();
+ for (ImportRoomFee 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 (ImportRoomFee importRoomFee : tmpImportCarFees) {
+ 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