diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java index 5eb5aaefbd..780a68019c 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java @@ -195,14 +195,22 @@ public class PointRuleServiceImpl extends BaseServiceImpl> customerListResult = operCrmOpenFeignClient.getAllCustomerList(); + log.info("initPointRule operCrmOpenFeignClient.getAllCustomerList result:{}",JSON.toJSONString(customerListResult)); if (!customerListResult.success() || CollectionUtils.isEmpty(customerListResult.getData())) { - log.error("获取所有客户列表失败"); + throw new RenException("获取所有客户列表失败"); } List customerDTOList = customerListResult.getData(); List ruleDefaultEntities = pointRuleDefaultDao.selectList(null); + if (CollectionUtils.isEmpty(ruleDefaultEntities)) { + log.warn("initPointRule pointRuleDefaultDao.selectList return empty"); + throw new RenException("获取默认规则失败"); + } List haveInitCustomerIds = baseDao.selectCustomerIds(); + if (haveInitCustomerIds == null) { + haveInitCustomerIds = new ArrayList<>(); + } List insertList = new ArrayList<>(); - ruleDefaultEntities.forEach(defaultRule -> { + for (PointRuleDefaultEntity defaultRule : ruleDefaultEntities) { for (CustomerDTO customerDTO : customerDTOList) { if (haveInitCustomerIds.contains(customerDTO.getId())) { continue; @@ -211,7 +219,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl