[bug]黑名单过期时间计算错误

src/main/java/org/springblade/common/utils/CommonDateUtil.java

@@ -52,4 +52,25 @@ public class CommonDateUtil {
 		return Integer.parseInt(String.valueOf(between_days)) + 1;
 	}
 
+	/**
+	 * 计算两个日期之间相差的天数, 不包含开始的天
+	 *
+	 * @param sdate 较小的时间
+	 * @param edate 较大的时间
+	 * @return 相差天数
+	 * @throws ParseException
+	 */
+	public static int daysBetweenWithoutStartDay(Date sdate, Date edate) {
+		sdate = DateUtil.parse(DateUtil.format(sdate, DateUtil.PATTERN_DATE), DateUtil.PATTERN_DATE);
+		edate = DateUtil.parse(DateUtil.format(edate, DateUtil.PATTERN_DATE), DateUtil.PATTERN_DATE);
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(sdate);
+		long time1 = cal.getTimeInMillis();
+		cal.setTime(edate);
+		long time2 = cal.getTimeInMillis();
+		long between_days = (time2 - time1) / (1000 * 3600 * 24);
+
+		return Integer.parseInt(String.valueOf(between_days));
+	}
+
 }

src/main/java/org/springblade/modules/business/controller/BlacklistController.java

@@ -23,6 +23,8 @@ import org.springblade.modules.business.vo.BlacklistVO;
 import org.springblade.modules.business.wrapper.BlacklistWrapper;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+
 /**
  * 控制器
  *
@@ -89,14 +91,16 @@ public class BlacklistController extends BladeController {
 
 		Blacklist blacklist = blacklistService.getLatelyRecord(cupCardNo);
 		int blacklistOutdate = DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE);
-		if (Func.isNotEmpty(blacklist) && CommonDateUtil.daysBetween(blacklist.getCreateTime(), DateUtil.now()) < blacklistOutdate) {
-			int days = CommonDateUtil.daysBetween(blacklist.getCreateTime(), DateUtil.now());
 
+		if (Func.isNotEmpty(blacklist) && CommonDateUtil.daysBetweenWithoutStartDay(blacklist.getCreateTime(), DateUtil.now()) < blacklistOutdate) {
+			// 更新提示信息为
+//			int days = CommonDateUtil.daysBetweenWithoutStartDay(blacklist.getCreateTime(), DateUtil.now());
+//			return R.data("由于您未及时进行报到，已被拉黑请于" + (blacklistOutdate - days) + "日后再次进行预约");
+			Date date1 = DateUtil.plusDays(blacklist.getCreateTime(), blacklistOutdate + 1);
 
-			return R.data("由于您未及时进行报到，已被拉黑请于" + (blacklistOutdate - days) + "日后再次进行预约");
+			return R.data("由于您未及时进行报到，已被拉黑请于" + DateUtil.format(date1, DateUtil.PATTERN_DATE) + "日后再次进行预约");
 		}
 
 		return R.data("");
 	}
-
 }

src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java

@@ -123,7 +123,7 @@ public class ApmRecordServiceImpl extends BaseServiceImpl<ApmRecordMapper, ApmRe
 
 		// 判断用户是否正在被拉黑
 		Blacklist blacklist = blacklistService.getLatelyRecord(cupCardNo);
-		if (Func.isNotEmpty(blacklist) && CommonDateUtil.daysBetween(blacklist.getCreateTime(), DateUtil.now()) < DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE)) {
+		if (Func.isNotEmpty(blacklist) && CommonDateUtil.daysBetweenWithoutStartDay(blacklist.getCreateTime(), DateUtil.now()) < DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE)) {
 			return ErrorMsgEnum.USER_IN_BLACKLIST.getValue();
 		}