Browse Source

[招商]adjust

release_toaliyun_real
Burce 6 years ago
parent
commit
8fcc8eb584
6 changed files with 12 additions and 12 deletions
  1. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java
  2. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java
  3. +3
    -5
      mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java
  4. +2
    -1
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java
  5. +3
    -2
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java

+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java View File

@@ -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<WxMall> mallList = wxMallMapper.findList(new WxMall());


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java View File

@@ -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();


+ 3
- 5
mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java View File

@@ -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 extends Enum<T>> T codeOf(Class enumType, String value) {
if (StringUtils.isEmpty(value)) {
if (StringUtils.isBlank(value)) {
return null;
}
int code = Integer.parseInt(value);


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java View File

@@ -111,8 +111,9 @@ public class InvestBaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceIm
LambdaQueryWrapper<InvestMessageEntity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(InvestMessageEntity::getType, type);
queryWrapper.eq(InvestMessageEntity::getTid, tid);
queryWrapper.eq(InvestMessageEntity::getTag,tag) ;
queryWrapper.in(InvestMessageEntity::getOwner, ownerArray);
List<InvestMessageEntity> before = messageService.list();
List<InvestMessageEntity> before = messageService.list(queryWrapper);
Map<Long,InvestMessageEntity> map = InvestHelper.getMap(before,InvestMessageEntity::getOwner) ;
List<InvestMessageEntity> messageEntityList = new ArrayList<>();
for (Long aLong : ownerArray) {


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java View File

@@ -70,7 +70,8 @@ public class InvestBizServiceImpl implements InvestBizService {
LambdaQueryWrapper<InvestCustomerEntity> queryWrapperCustomer = new LambdaQueryWrapper<>(customerParams);
InvestPageResult<InvestCustomerEntity> 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);
}
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java View File

@@ -54,7 +54,7 @@ public class InvestTaskServiceImpl extends InvestBaseServiceImpl<InvestTaskDao,

private void saveMessage(InvestTaskEntity entity) {
String owner = entity.getOwner();
if (StringUtils.isNotEmpty(owner)) {
if (StringUtils.isNotBlank(owner)) {
List<Long> ownerArray = JSONArray.parseArray(owner, Long.class);
this.saveBatchMessage(ownerArray, EnumInvestMessageType.TASK_CREATE.getInfo(), EnumInvestMessageTag.TASK_CREATE, EnumFollowType.TASK, entity.getId());
}


Loading…
Cancel
Save