Skip to content

M
midjourney-proxy
Commit 4dbdcb0c by 朱亚洁
Options

fixbug1019123

parent 302af1fc
Showing with 9 additions and 9 deletions
pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/impl/LinkRevertBizImpl.java
...@@ -116,8 +116,8 @@ public class LinkRevertBizImpl implements LinkRevertBiz { ...@@ -116,8 +116,8 @@ public class LinkRevertBizImpl implements LinkRevertBiz {
//今日之前发送次数 //今日之前发送次数
List<Long> linkIds = list.stream().filter(s -> s.getLink() != null).map(LinkRevertRecordDTO::getId).distinct().collect(Collectors.toList()); List<Long> linkIds = list.stream().filter(s -> s.getLink() != null).map(LinkRevertRecordDTO::getId).distinct().collect(Collectors.toList());
Map<Long, LinkRevertRecordDTO> sendCountMap = advertisingLinkSendDao.mapSendCount(linkIds); Map<Long, LinkRevertRecordDTO> sendCountMap = advertisingLinkSendDao.mapSendCount(linkIds);
//今日发送次数 //今日发送次数,因耗时不统计今天的20200106bug1019123
Map<String, Integer> sendCountTodayMap = wechatGroupConsr.getLinkSendCount(paramDTOS); // Map<String, Integer> sendCountTodayMap = wechatGroupConsr.getLinkSendCount(paramDTOS);
for (LinkRevertRecordDTO revertRecordDTO : list) { for (LinkRevertRecordDTO revertRecordDTO : list) {
AdvertisingBrandDTO brandDTO = advertisingBrandDao.getBrandById(revertRecordDTO.getBrandId()); AdvertisingBrandDTO brandDTO = advertisingBrandDao.getBrandById(revertRecordDTO.getBrandId());
revertRecordDTO.setBrandName(null == brandDTO ? "" : brandDTO.getBrandName()); revertRecordDTO.setBrandName(null == brandDTO ? "" : brandDTO.getBrandName());
...@@ -128,9 +128,9 @@ public class LinkRevertBizImpl implements LinkRevertBiz { ...@@ -128,9 +128,9 @@ public class LinkRevertBizImpl implements LinkRevertBiz {
if (!MapUtils.isEmpty(sendCountMap) && sendCountMap.containsKey(revertRecordDTO.getId())) { if (!MapUtils.isEmpty(sendCountMap) && sendCountMap.containsKey(revertRecordDTO.getId())) {
sendCount = sendCountMap.get(revertRecordDTO.getId()).getSendCount(); sendCount = sendCountMap.get(revertRecordDTO.getId()).getSendCount();
} }
if (!MapUtils.isEmpty(sendCountTodayMap) && sendCountTodayMap.containsKey(revertRecordDTO.getShortLink())) { // if (!MapUtils.isEmpty(sendCountTodayMap) && sendCountTodayMap.containsKey(revertRecordDTO.getShortLink())) {
sendCount = sendCount + sendCountTodayMap.get(revertRecordDTO.getShortLink()); // sendCount = sendCount + sendCountTodayMap.get(revertRecordDTO.getShortLink());
} // }
revertRecordDTO.setSendCount(sendCount); revertRecordDTO.setSendCount(sendCount);
} }
return pageBean; return pageBean;
...@@ -161,7 +161,7 @@ public class LinkRevertBizImpl implements LinkRevertBiz { ...@@ -161,7 +161,7 @@ public class LinkRevertBizImpl implements LinkRevertBiz {
List<Long> linkIds = list.stream().filter(s -> s.getLink() != null).map(LinkRevertRecordDTO::getId).distinct().collect(Collectors.toList()); List<Long> linkIds = list.stream().filter(s -> s.getLink() != null).map(LinkRevertRecordDTO::getId).distinct().collect(Collectors.toList());
Map<Long, LinkRevertRecordDTO> sendCountMap = advertisingLinkSendDao.mapSendCount(linkIds); Map<Long, LinkRevertRecordDTO> sendCountMap = advertisingLinkSendDao.mapSendCount(linkIds);
//今日发送次数 //今日发送次数
Map<String, Integer> sendCountTodayMap = wechatGroupConsr.getLinkSendCount(paramDTOS); // Map<String, Integer> sendCountTodayMap = wechatGroupConsr.getLinkSendCount(paramDTOS);
for (int i = 0, size = list.size(); i < size; i++) { for (int i = 0, size = list.size(); i < size; i++) {
LinkRevertRecordDTO revertRecordDTO = list.get(i); LinkRevertRecordDTO revertRecordDTO = list.get(i);
Object[] obj = new Object[rowsName.length]; Object[] obj = new Object[rowsName.length];
...@@ -174,9 +174,9 @@ public class LinkRevertBizImpl implements LinkRevertBiz { ...@@ -174,9 +174,9 @@ public class LinkRevertBizImpl implements LinkRevertBiz {
if (!MapUtils.isEmpty(sendCountMap) && sendCountMap.containsKey(revertRecordDTO.getId())) { if (!MapUtils.isEmpty(sendCountMap) && sendCountMap.containsKey(revertRecordDTO.getId())) {
sendCount = sendCountMap.get(revertRecordDTO.getId()).getSendCount(); sendCount = sendCountMap.get(revertRecordDTO.getId()).getSendCount();
} }
if (!MapUtils.isEmpty(sendCountTodayMap) && sendCountTodayMap.containsKey(revertRecordDTO.getShortLink())) { // if (!MapUtils.isEmpty(sendCountTodayMap) && sendCountTodayMap.containsKey(revertRecordDTO.getShortLink())) {
sendCount = sendCount + sendCountTodayMap.get(revertRecordDTO.getShortLink()); // sendCount = sendCount + sendCountTodayMap.get(revertRecordDTO.getShortLink());
} // }
obj[4] = sendCount; obj[4] = sendCount;
LinkRevertRecordDTO clickStatistic = advertisingLinkClickDao.getCountByLink(revertRecordDTO.getShortLink()); LinkRevertRecordDTO clickStatistic = advertisingLinkClickDao.getCountByLink(revertRecordDTO.getShortLink());
obj[5] = null == clickStatistic ? 0 : clickStatistic.getClickCount(); obj[5] = null == clickStatistic ? 0 : clickStatistic.getClickCount();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment