huangmp 4 lat temu
rodzic
commit
a798680031

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

@@ -241,7 +241,7 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 	 * @return
 	 */
 	@Override
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	public boolean addApplyUserForFamily(ApplyUser applyUser) {
 		applyUser.setFaceUrl(confClient.removePrefix(applyUser.getFaceUrl()));
 		applyUser.setEntryImgUri(confClient.removePrefix(applyUser.getEntryImgUri()));
@@ -281,7 +281,7 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	public boolean updateCheckState(ApplyUser condition) {
 		Boolean result = false;
 		ApplyUser applyUser = this.getById(condition.getId());
@@ -302,7 +302,6 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 
 				if (applyUser.getUserId() != null) {//编辑
 					HouseUser searchUser = new HouseUser();
-					searchUser.setMemberId(applyUser.getMemberId());
 					searchUser.setId(applyUser.getUserId());
 					oldUser = this.houseUserClient.detail(searchUser);
 				}
@@ -378,6 +377,7 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 					Calendar cd = Calendar.getInstance();
 					cd.setTime(beginDate);
 					cd.add(Calendar.YEAR, 20);
+					houseUser.setMemberId(applyUser.getMemberId());
 					houseUser.setFaceBeginDate(beginDate);
 					houseUser.setFaceEndDate(cd.getTime());
 					//往user增加faceEnable并设置为0