修改小程序添加家人

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/ApplyUser.java

@@ -208,5 +208,6 @@ public class ApplyUser extends BaseEntity {
 	@ApiModelProperty(value = "租户ID")
 	private String tenantId;
 
-
+	@ApiModelProperty(value = "社区名称")
+	private String agencyName;
 }

blade-service-api/person-api/src/main/java/org/springblade/person/feign/HouseUserClientFallback.java

@@ -70,6 +70,16 @@ public class HouseUserClientFallback implements IHouseUserClient {
 		return false;
 	}
 
+	@Override
+	public HouseUser saveReturnHouseUser(@Valid HouseUser houseUser) {
+		return null;
+	}
+
+	@Override
+	public boolean saveOrUpdate(@Valid HouseUser houseUser) {
+		return false;
+	}
+
 	/**
 	 * 修改
 	 */

blade-service-api/person-api/src/main/java/org/springblade/person/feign/IHouseUserClient.java

@@ -77,6 +77,17 @@ public interface IHouseUserClient {
 	@PostMapping("/save")
 	boolean save(@Valid @RequestBody HouseUser houseUser);
 
+	/**
+	 * 新增
+	 * @param houseUser
+	 * @return
+	 */
+	@PostMapping("/saveReturnHouseUser")
+	HouseUser saveReturnHouseUser(@Valid @RequestBody HouseUser houseUser);
+
+	@PostMapping("/saveOrUpdate")
+	boolean saveOrUpdate(@Valid @RequestBody HouseUser houseUser);
+
 	/**
 	 * 修改
 	 */

blade-service/estate/src/main/java/org/springblade/estate/service/impl/ApplyUserServiceImpl.java

@@ -252,11 +252,12 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 			this.save(applyUserDTO);
 			//构造一个HouseUser
 			HouseUser houseUser = this.applyUserToUser(applyUserDTO);
-			save = houseUserClient.save(houseUser);
-			if(save){
+			houseUser = houseUserClient.saveReturnHouseUser(houseUser);
+			if(null != houseUser){
 				//下发默认开门权限
 				UserAccessPermissionsDTO userAccessPermissionsDTO = new UserAccessPermissionsDTO();
 				userAccessPermissionsDTO.setUserId(Func.toStr(houseUser.getId()));
+				userAccessPermissionsDTO.setUserName(houseUser.getName());
 				userAccessPermissionsDTO.setUserType(CommonConstant.UserFlag.HOUSE_USER_FLAG.getValue());
 				userAccessPermissionsDTO.setTargetType(1);
 				userAccessPermissionsDTO.setResidentialId(houseUser.getResidentialId());
@@ -268,7 +269,7 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 				//新增人数
 				communityClient.addPersonNum(houseUser.getAgencyId(), houseUser.getResidentialId()
 					, houseUser.getBuildingId(), houseUser.getUnitId(), houseUser.getFloorId(), houseUser.getRoomId());
-				return save;
+				return true;
 			}else{
 				return false;
 			}
@@ -395,7 +396,7 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 		if (StringUtils.isNotBlank(applyUser.getFaceUrl())) {
 			user.setFaceUrl(applyUser.getFaceUrl());
 			user.setImageMd5(applyUser.getImageMd5());
-			user.setFaceEnable(1); //未激活
+			user.setFaceEnable(0); //未激活
 		} else {
 			user.setAuditStatus(-1); //未上传人脸
 			user.setFaceEnable(-1); //未上传人脸
@@ -418,9 +419,11 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 		user.setUnitId(applyUser.getUnitId());
 		user.setUnitName(applyUser.getUnitName());
 		user.setAgencyId(applyUser.getAgencyId());
+		user.setAgencyName(applyUser.getAgencyName());
 		user.setResidentialId(applyUser.getResidentialId());
 		user.setResidentialName(applyUser.getResidentialName());
 		user.setCreateType(applyUser.getCreateType());
+		user.setTenantId(applyUser.getTenantId());
 		return user;
 	}
 

blade-service/estate/src/main/java/org/springblade/estate/service/impl/AuthorizeRecordsServiceImpl.java

@@ -88,6 +88,7 @@ public class AuthorizeRecordsServiceImpl extends BaseServiceImpl<AuthorizeRecord
 		authRecord.setAuthCmd(authCmd);
 		authRecord.setAuthStatus(CommonConstant.AuthStatus.WAIT.getValue());
 		authRecord.setAuthRespMsg(respMsg);
+		authRecord.setTenantId(tenantId);
 		String deviceName = null;
 		String deviceAddress = null;
 		String agencyName = null;

blade-service/estate/src/main/java/org/springblade/estate/service/impl/UserAccessPermissionsServiceImpl.java

@@ -199,6 +199,7 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 				userDeviceDTO.setUserFaceUrl(userAccessPermissionsDTO.getUserFace());
 				userDeviceDTO.setUserName(userAccessPermissionsDTO.getUserName());
 				userDeviceDTO.setDeviceFactory(deviceFactory);
+				userDeviceDTO.setTenantId(userAccessPermissionsDTO.getTenantId());
 				if (userAccessPermissionsDTO.getEndTime() != null && userAccessPermissionsDTO.getBeginTime() != null) {
 					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 					userDeviceDTO.setStartTime(sdf.format(userAccessPermissionsDTO.getBeginTime()));

blade-service/person/src/main/java/org/springblade/person/feign/HouseUserClient.java

@@ -134,6 +134,25 @@ public class HouseUserClient implements IHouseUserClient {
 		return houseUserService.save(houseUser);
 	}
 
+	/**
+	 * 新增
+	 */
+	@Override
+	@PostMapping("/saveReturnHouseUser")
+	public HouseUser saveReturnHouseUser(@Valid @RequestBody HouseUser houseUser) {
+		if (houseUserService.save(houseUser)){
+			return houseUser;
+		}else {
+			return null;
+		}
+	}
+
+	@Override
+	@PostMapping("/saveOrUpdate")
+	public boolean saveOrUpdate(@Valid @RequestBody HouseUser houseUser){
+		return houseUserService.saveOrUpdate(houseUser);
+	}
+
 	/**
 	 * 修改
 	 */

community-app-gateway/src/main/java/org/springblade/app/controller/MemberController.java

@@ -548,9 +548,16 @@ public class MemberController {
 		Assert.notNull(applyUserDTO.getIdCard(), "身份证必传");
 		Residential residential = residentialClient.getById(applyUserDTO.getResidentialId());
 		Assert.notNull(residential, "所属小区不存在");
-		applyUserDTO.setTenantId(residential.getTenantId());
+//		applyUserDTO.setTenantId(residential.getTenantId());
 		applyUserDTO.setAgencyId(residential.getAgencyId());
+		applyUserDTO.setAgencyName(residential.getAgencyName());
+		applyUserDTO.setResidentialName(residential.getName());
 		applyUserDTO.setTenantId(residential.getTenantId());
+		Room room = roomClient.getById(applyUserDTO.getRoomId());
+		Assert.notNull(room, "所属房间不存在");
+		applyUserDTO.setBuildingName(room.getBuildingName());
+		applyUserDTO.setUnitName(room.getUnitName());
+		applyUserDTO.setRoomName(room.getName());
 		List<HouseUserVO> userList = houseUserClient.getListByMember(applyUserDTO.getMemberId(), applyUserDTO.getResidentialId(), applyUserDTO.getRoomId());
 		for(HouseUserVO houseUserVO : userList){
 			String name = applyUserDTO.getName();