Browse Source

[招商]adjust

release_toaliyun_real
Burce 6 years ago
parent
commit
537c0dfeab
1 changed files with 5 additions and 4 deletions
  1. +5
    -4
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java

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

@@ -92,6 +92,8 @@ public class InvestBizServiceImpl implements InvestBizService {
}
List<InvestDemandEntity> demandList = demandService.list(new LambdaQueryWrapper<>(demandParams));
LambdaQueryWrapper<InvestCustomerEntity> queryWrapperCustomer = new LambdaQueryWrapper<>(customerParams);
queryWrapperCustomer.like(StringUtils.isNotBlank(params.getCustomerNo()), InvestCustomerEntity::getCustomerNo, params.getCustomerNo());

if (Objects.isNull(InvestUserContext.getDataUser())) {
if (CollectionUtils.isEmpty(demandList) && Objects.nonNull(params.getDemandOwner())) {
return investPage;
@@ -105,7 +107,7 @@ public class InvestBizServiceImpl implements InvestBizService {
queryWrapperCustomer.in(CollectionUtils.isNotEmpty(demandList),InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId));
}
}
queryWrapperCustomer.like(StringUtils.isNotBlank(params.getCustomerNo()), InvestCustomerEntity::getCustomerNo, params.getCustomerNo());
queryWrapperCustomer.orderByDesc(InvestCustomerEntity::getCreateDate);
InvestPageResult<InvestCustomerEntity> customers = customerService.queryPage(buildPageQuery(params, null), queryWrapperCustomer);
List<InvestDemandVo> resultList = getTargeInfoList(demandList, customers.getRecords());
@@ -325,7 +327,7 @@ public class InvestBizServiceImpl implements InvestBizService {
InvestDemandDto customerBase = convetCustomer(customer, brandMap, businesseMap, shopMap, customerMap);
if (customerBase == null) {
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1);
log.error("userBasenull");
log.error("customerBase null");
}
saveCustomerAndDemand(customerBase) ;
});
@@ -421,9 +423,8 @@ public class InvestBizServiceImpl implements InvestBizService {

private InvestDemandDto doConvertDemand(InvestDemandQuery params) {
InvestCustomerEntity customerEntity = null;
if (ObjectUtils.anyNotNull(params.getCustomerNo(), params.getCustomerType(), params.getBusinessId())) {
if (ObjectUtils.anyNotNull(params.getCustomerType(), params.getBusinessId())) {
customerEntity = new InvestCustomerEntity();
customerEntity.setCustomerNo(params.getCustomerNo());
customerEntity.setType(params.getCustomerType());
customerEntity.setBusinessId(params.getBusinessId());
}


Loading…
Cancel
Save