diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index baaa98cd2..10c763881 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -211,7 +211,7 @@ public class CouponSendSchedule { /** * 生日券发放 */ - @Scheduled(cron = "0 30 15 * * ?") // 测试每天8:30点发券 + @Scheduled(cron = "0 30 8 * * ?") // 测试每天8:30点发券 public void birthdayCouponSendSchedule() { logger.info("生日发券: 任务开始"); List mallList = wxMallMapper.findList(new WxMall()); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java index 42e282771..6a2cc4f1f 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java @@ -34,8 +34,8 @@ public class InvestSchedule { InvestFollowRecordService followRecordService; - @Scheduled(cron = "0 0 14 * * ?") // 每天凌晨1点盘点前一天的数据 - //@Scheduled(cron = "*/30 * * * * ?") // 测试10秒中一次 + //@Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务 + @Scheduled(cron = "0 */5 * * * *?") // 测试,每5分钟执行 public void messageSchedule() { //一个月内未完成提醒 taskMonthMessage(); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java index e6ff4cc61..23205df5d 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java @@ -1,6 +1,5 @@ package com.iformall.service.invest; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.Multimaps; @@ -8,9 +7,8 @@ import com.iformall.common.ErrorCode; import com.iformall.domain.po.invest.InvestBaseEntity; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.exception.MallinkException; -import org.apache.commons.compress.utils.Lists; +import org.apache.commons.lang3.StringUtils; import org.checkerframework.checker.nullness.qual.Nullable; -import org.springframework.util.CollectionUtils; import java.lang.reflect.Method; import java.text.MessageFormat; @@ -32,7 +30,7 @@ public class InvestHelper { } private static void camelToUnderline(String sortColumn, String sortOrder, Page page) { - if (StringUtils.isEmpty(sortColumn)) { + if (StringUtils.isBlank(sortColumn)) { return; } if (Objects.equals(sortOrder, "desc")) { @@ -123,7 +121,7 @@ public class InvestHelper { @SuppressWarnings("unchecked") public static > T codeOf(Class enumType, String value) { - if (StringUtils.isEmpty(value)) { + if (StringUtils.isBlank(value)) { return null; } int code = Integer.parseInt(value); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java index 135d0693d..4bf2ea573 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java @@ -111,8 +111,9 @@ public class InvestBaseServiceImpl, T> extends ServiceIm LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(InvestMessageEntity::getType, type); queryWrapper.eq(InvestMessageEntity::getTid, tid); + queryWrapper.eq(InvestMessageEntity::getTag,tag) ; queryWrapper.in(InvestMessageEntity::getOwner, ownerArray); - List before = messageService.list(); + List before = messageService.list(queryWrapper); Map map = InvestHelper.getMap(before,InvestMessageEntity::getOwner) ; List messageEntityList = new ArrayList<>(); for (Long aLong : ownerArray) { diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 03315ca07..27691e590 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -70,7 +70,8 @@ public class InvestBizServiceImpl implements InvestBizService { LambdaQueryWrapper queryWrapperCustomer = new LambdaQueryWrapper<>(customerParams); InvestPageResult customers; if (Objects.isNull(InvestUserContext.getDataUser())) { - queryWrapperCustomer.in(ObjectUtils.allNotNull(params.getDemandOwner()),InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId)); + queryWrapperCustomer.in(ObjectUtils.allNotNull(params.getDemandOwner()), + InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId)); } else { if(CollectionUtils.isEmpty(demandList)) { return investPage; @@ -504,7 +505,7 @@ public class InvestBizServiceImpl implements InvestBizService { if (count > 0) { investTaskEntity.setStatus(EnumTaskStatus.INTENTION); } else { - if (StringUtils.isNotEmpty(investTaskEntity.getOwner())) { + if (StringUtils.isNotBlank(investTaskEntity.getOwner())) { investTaskEntity.setStatus(EnumTaskStatus.NEGOTIATING); } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java index 972384772..2572c393d 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java @@ -54,7 +54,7 @@ public class InvestTaskServiceImpl extends InvestBaseServiceImpl ownerArray = JSONArray.parseArray(owner, Long.class); this.saveBatchMessage(ownerArray, EnumInvestMessageType.TASK_CREATE.getInfo(), EnumInvestMessageTag.TASK_CREATE, EnumFollowType.TASK, entity.getId()); }