feat: 积分包过截止日期后不能选到和提交任务2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -3061,7 +3061,7 @@ public class ApiController {
 	}
 
 	/**
-	 * 获取登录人积分包
+	 * 获取登录人积分包(已知打卡/转发 的选择积分包列表用的这个接口)
 	 *
 	 * @param type 任务类型
 	 * @return 积分包信息
@@ -3102,7 +3102,9 @@ public class ApiController {
 			if ("0".equals(wmScorePackage.getTaskAddFlag())
 					|| "1".equals(wmScorePackage.getEnableFlag())
 					|| "3".equals(wmScorePackage.getPackageType1())
-					|| (PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val().equals(wmScorePackage.getPackageType2()) && !PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(wmScorePackage.getPackageType1()))) {
+					|| (PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val().equals(wmScorePackage.getPackageType2())
+					&& !PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(wmScorePackage.getPackageType1()))
+					|| LocalDate.now().isAfter(wmScorePackage.getEndTime())) {
 				continue;
 			}
 
@@ -3264,6 +3266,9 @@ public class ApiController {
 		if (StringUtils.isEmpty(tWmScorePackage.getRuleId())) {
 			return R.failed("积分包未配置积分规则");
 		}
+		if (LocalDate.now().isAfter(tWmScorePackage.getEndTime())) {
+			throw new BizException("当前积分包已过截止日期");
+		}
 
 		if ("article".equalsIgnoreCase(taskCategoryName)) {
 			wmWkArticle = wmWkArticleService.getById(id);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmUserSignServiceImpl.java

@@ -137,6 +137,9 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
 			log.warn("获取不到积分包：{}", pkgId);
 			throw new BizException("获取不到积分包");
 		}
+		if (LocalDate.now().isAfter(tWmScorePackage.getEndTime())) {
+			throw new BizException("当前积分包已过截止日期");
+		}
 
 		if (StringUtils.isEmpty(tWmScorePackage.getRuleId())) {
 			log.warn("积分包未配置积分规则：{}", pkgId);