|
|
@ -5,10 +5,10 @@ import com.epmet.commons.tools.constant.NumConstant; |
|
|
|
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|
|
|
import com.epmet.commons.tools.exception.RenException; |
|
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
|
//import com.epmet.dto.CustomerDTO;
|
|
|
|
import com.epmet.dto.CustomerDTO; |
|
|
|
import com.epmet.dto.IssueDTO; |
|
|
|
import com.epmet.feign.GovIssueOpenFeignClient; |
|
|
|
//import com.epmet.feign.OperCrmOpenFeignClient;
|
|
|
|
import com.epmet.feign.OperCrmOpenFeignClient; |
|
|
|
import com.epmet.commons.tools.enums.AchievementTypeEnum; |
|
|
|
import com.epmet.modules.group.dao.ResiGroupDao; |
|
|
|
import com.epmet.modules.group.entity.ResiGroupAchievementConfigEntity; |
|
|
@ -50,8 +50,8 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService |
|
|
|
private ResiTopicDao resiTopicDao; |
|
|
|
@Autowired |
|
|
|
private ResiGroupDao resiGroupDao; |
|
|
|
// @Autowired
|
|
|
|
// private OperCrmOpenFeignClient operCrmOpenFeignClient;
|
|
|
|
@Autowired |
|
|
|
private OperCrmOpenFeignClient operCrmOpenFeignClient; |
|
|
|
@Autowired |
|
|
|
private GovIssueOpenFeignClient govIssueOpenFeignClient; |
|
|
|
|
|
|
@ -387,10 +387,10 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService |
|
|
|
private List<String> getCustomerIds(String customerId) { |
|
|
|
List<String> customerIdList = new ArrayList<>(); |
|
|
|
if (StringUtils.isBlank(customerId)) { |
|
|
|
// Result<List<CustomerDTO>> allCustomerList = operCrmOpenFeignClient.getAllCustomerList();
|
|
|
|
// if (allCustomerList != null && !CollectionUtils.isEmpty(allCustomerList.getData())) {
|
|
|
|
// customerIdList.addAll(allCustomerList.getData().stream().map(CustomerDTO::getId).collect(Collectors.toList()));
|
|
|
|
// }
|
|
|
|
Result<List<CustomerDTO>> allCustomerList = operCrmOpenFeignClient.getAllCustomerList(); |
|
|
|
if (allCustomerList != null && !CollectionUtils.isEmpty(allCustomerList.getData())) { |
|
|
|
customerIdList.addAll(allCustomerList.getData().stream().map(CustomerDTO::getId).collect(Collectors.toList())); |
|
|
|
} |
|
|
|
} else { |
|
|
|
customerIdList.add(customerId); |
|
|
|
} |
|
|
|