|
|
|
@@ -105,6 +105,9 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
queryWrapperCustomer.in(CollectionUtils.isNotEmpty(demandList), InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId)); |
|
|
|
} |
|
|
|
} |
|
|
|
if(CollectionUtils.isNotEmpty(params.getCustomerType())) { |
|
|
|
queryWrapperCustomer.in(InvestCustomerEntity::getType,params.getCustomerType()) ; |
|
|
|
} |
|
|
|
|
|
|
|
queryWrapperCustomer.orderByDesc(InvestCustomerEntity::getCreateDate); |
|
|
|
InvestPageResult<InvestCustomerEntity> customers = customerService.queryPage(buildPageQuery(params, null), queryWrapperCustomer); |
|
|
|
@@ -345,33 +348,33 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
try { |
|
|
|
successList.forEach(customer -> { |
|
|
|
if (StringUtils.isBlank(customer.getPhone())) { |
|
|
|
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); |
|
|
|
redisKeyIncrement(importKey, "processCount", "failCount"); |
|
|
|
log.error("负责人电话为空", customer.toString()); |
|
|
|
return; |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(customer.getShopNumber())) { |
|
|
|
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); |
|
|
|
redisKeyIncrement(importKey, "processCount", "failCount"); |
|
|
|
log.error("意向铺位为空", customer.toString()); |
|
|
|
return; |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(customer.getBrandName())) { |
|
|
|
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); |
|
|
|
redisKeyIncrement(importKey, "processCount", "failCount"); |
|
|
|
log.error("品牌为空", customer.toString()); |
|
|
|
return; |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(customer.getName())) { |
|
|
|
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); |
|
|
|
log.error("品牌负责人为空", customer.toString()); |
|
|
|
return; |
|
|
|
} |
|
|
|
//if (StringUtils.isBlank(customer.getName())) { |
|
|
|
// redisKeyIncrement(importKey, "processCount","failCount") ; |
|
|
|
// log.error("品牌负责人为空", customer.toString()); |
|
|
|
// return; |
|
|
|
//} |
|
|
|
if (StringUtils.isBlank(customer.getBusiness())) { |
|
|
|
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); |
|
|
|
redisKeyIncrement(importKey, "processCount", "failCount"); |
|
|
|
log.error("经营业态为空", customer.toString()); |
|
|
|
return; |
|
|
|
} |
|
|
|
InvestDemandDto toImportCustomer = convetCustomer(importKey, customer, brandMap, businesseMap, shopMap, customerMap.get(customer.getPhone()), demandMap); |
|
|
|
if (toImportCustomer == null) { |
|
|
|
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); |
|
|
|
redisKeyIncrement(importKey, "processCount", "failCount"); |
|
|
|
log.error("customerBase null"); |
|
|
|
return; |
|
|
|
} |
|
|
|
@@ -382,7 +385,7 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
updateCustomerAndDemand(toImportCustomer); |
|
|
|
} |
|
|
|
//记数 |
|
|
|
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); |
|
|
|
redisKeyIncrement(importKey, "processCount"); |
|
|
|
stringRedisTemplate.expire(importKey, 10, TimeUnit.SECONDS); |
|
|
|
}); |
|
|
|
} catch (Exception e) { |
|
|
|
@@ -414,10 +417,10 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
if (Objects.isNull(demandEntity)) { |
|
|
|
demandEntity = new InvestDemandEntity(); |
|
|
|
} |
|
|
|
if (Objects.isNull(brandMap.get(importCustomerVo.getBrandName()))) { |
|
|
|
log.warn("品牌:{} 不存在", importCustomerVo.getBrandName()); |
|
|
|
return null; |
|
|
|
} |
|
|
|
//if (Objects.isNull(brandMap.get(importCustomerVo.getBrandName()))) { |
|
|
|
// log.warn("品牌:{} 不存在", importCustomerVo.getBrandName()); |
|
|
|
// return null; |
|
|
|
//} |
|
|
|
customerEntity.setBrandId(brandMap.get(importCustomerVo.getBrandName()).getId()); |
|
|
|
|
|
|
|
if (Objects.isNull(businesseMap.get(importCustomerVo.getBusiness()))) { |
|
|
|
@@ -478,6 +481,12 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
log.error(e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
private void redisKeyIncrement(String key, String... hashKey) { |
|
|
|
for (String s : hashKey) { |
|
|
|
stringRedisTemplate.opsForHash().increment(key, s, 1); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<InvestDemandVo> queryCustomer() { |
|
|
|
List<InvestCustomerEntity> customerEntities = customerService.list(); |
|
|
|
@@ -486,9 +495,9 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
|
|
|
|
private InvestDemandDto doConvertDemand(InvestDemandQuery params) { |
|
|
|
InvestCustomerEntity customerEntity = null; |
|
|
|
if (ObjectUtils.anyNotNull(params.getCustomerType(), params.getBusinessId())) { |
|
|
|
if (ObjectUtils.anyNotNull(params.getBusinessId())) { |
|
|
|
customerEntity = new InvestCustomerEntity(); |
|
|
|
customerEntity.setType(params.getCustomerType()); |
|
|
|
//customerEntity.setType(params.getCustomerType()); |
|
|
|
customerEntity.setBusinessId(params.getBusinessId()); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -909,7 +918,7 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
if (Objects.isNull(shop)) { |
|
|
|
return new HashMap<>(); |
|
|
|
} |
|
|
|
return rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), StringUtils.join(shop.getId(), ""), |
|
|
|
return rentContractService.selectRentContractByShopIds(Collections.singletonList(shop.getId()), StringUtils.join(shop.getId(), ""), |
|
|
|
InvestUserContext.getUser().getTenantId()); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -921,9 +930,16 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
InvestCustomerEntity customerEntity = customerService.getByIdNotNull(remindVo.getCustomerId()); |
|
|
|
if (Objects.nonNull(customerEntity)) { |
|
|
|
remindVo.setCustomer(customerEntity); |
|
|
|
remindVo.setBrand(brandService.getById(customerEntity.getBrandId())); |
|
|
|
WxBrand brand = brandService.getById(customerEntity.getBrandId()); |
|
|
|
if (Objects.nonNull(brand)) { |
|
|
|
remindVo.setBrand(brand); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
MallUserInfo userInfo = userInfoService.getById(remindEntity.getOwner()); |
|
|
|
if (Objects.nonNull(userInfo)) { |
|
|
|
remindVo.setOwnerInfo(userInfo); |
|
|
|
} |
|
|
|
remindVo.setOwnerInfo(userInfoService.getById(remindEntity.getOwner())); |
|
|
|
return remindVo; |
|
|
|
} |
|
|
|
|
|
|
|
|