From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/discuss/controller/UserPublicEnrollController.java |   30 ++++++++----------------------
 1 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/controller/UserPublicEnrollController.java b/src/main/java/org/springblade/modules/discuss/controller/UserPublicEnrollController.java
index 213540e..fb82889 100644
--- a/src/main/java/org/springblade/modules/discuss/controller/UserPublicEnrollController.java
+++ b/src/main/java/org/springblade/modules/discuss/controller/UserPublicEnrollController.java
@@ -107,29 +107,15 @@
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入userPublicEnroll")
 	public R save(@Valid @RequestBody UserPublicEnrollEntity userPublicEnroll) {
-		userPublicEnroll.setUserId(AuthUtil.getUserId());
-		// 判断是否一户一票 还是一人一票
-		IPublicDiscussService bean = SpringUtil.getBean(IPublicDiscussService.class);
-		PublicDiscussEntity one = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getId, userPublicEnroll.getPublicDiscussId()));
-		// 一户一票
-		if (one.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
-			long count = userPublicEnrollService.count(Wrappers.<UserPublicEnrollEntity>lambdaQuery()
-				.eq(UserPublicEnrollEntity::getPublicDiscussId, userPublicEnroll.getPublicDiscussId())
-				.eq(UserPublicEnrollEntity::getUserId, userPublicEnroll.getUserId())
-				.eq(UserPublicEnrollEntity::getHouseCode, userPublicEnroll.getHouseCode()));
-			if (count > 0) {
-				return R.fail("您房屋已经报名,不能重复报名!");
-			}
-			// 一人一票
-		} else {
-			long count = userPublicEnrollService.count(Wrappers.<UserPublicEnrollEntity>lambdaQuery()
-				.eq(UserPublicEnrollEntity::getPublicDiscussId, userPublicEnroll.getPublicDiscussId())
-				.eq(UserPublicEnrollEntity::getUserId, userPublicEnroll.getUserId()));
-			if (count > 0) {
-				return R.fail("您已报名,不能重复报名!");
-			}
+		Integer aBoolean = userPublicEnrollService.saveUserPublicEnrollEntity(userPublicEnroll);
+		if (aBoolean.equals(3)) {
+			return R.fail("您房屋已经报名,不能重复报名!");
+		} else if (aBoolean.equals(4)) {
+			return R.fail("您已报名,不能重复报名!");
+		} else if (aBoolean.equals(1)) {
+			return R.status(true);
 		}
-		return R.status(userPublicEnrollService.save(userPublicEnroll));
+		return R.fail("失败!");
 	}
 
 	/**

--
Gitblit v1.9.3