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