|
|
@@ -533,7 +533,7 @@ public class WorkerLogic {
|
|
|
List<AdminWebsit> adminWebsits = new ArrayList<>();
|
|
|
for (WebsitUser websitUser : websitUsers) {
|
|
|
|
|
|
- //保障，生效小于1 或 保障待生效，时间小于过期提醒 且 订单保障待生效 小于1
|
|
|
+ //保障，生效小于1 或 保障待生效，时间小于过期提醒 且 订单大于提醒日期得保障待生效 小于1
|
|
|
if ((workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
|
|
|
.eq(WorkerPolicy::getPolicyType,"AC")
|
|
|
.in(WorkerPolicy::getStatus,"BZZ","DSX").count() < 1 ||
|
|
|
@@ -549,6 +549,7 @@ public class WorkerLogic {
|
|
|
.in(PolicyOrder::getPolicyOrderStatus,"DSX","BZZ")
|
|
|
.eq(PolicyOrder::getType,"AC")
|
|
|
.eq(PolicyOrder::getIsPay,IsYesNoEnum.YES.getKey())
|
|
|
+ .ge(PolicyOrder::getEndTime,DateUtil.endOfDay(DateUtil.offsetDay(new Date(),mailbox.getOverNum())))
|
|
|
.eq(PolicyOrder::getWebsitUserId,websitUser.getId())
|
|
|
.count() < 1
|
|
|
|
‘linchangsheng’