diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index c0390aae4..49c52d9f8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -1610,8 +1610,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity grantItemCountRecordMap = grantItemCountList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getGrantItemId,Collectors.mapping(OfflineActivityGrantItemVo::getOrderNo,Collectors.toList()))); grantItemCountMap = grantItemCountList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getRecordId)); List recordCountIds = grantItemCountList.stream().map(OfflineActivityGrantItemVo::getRecordId).distinct().collect(toList()); + recordIds.removeAll(recordCountIds); recordIds.addAll(recordCountIds); List grantCountIds = grantItemCountList.stream().map(OfflineActivityGrantItemVo::getGrantId).distinct().collect(toList()); + grantIds.removeAll(grantCountIds); grantIds.addAll(grantCountIds); //联单表头 @@ -1741,8 +1743,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity grantItemCountRecordMap = grantItemCountList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getGrantItemId,Collectors.mapping(OfflineActivityGrantItemVo::getOrderNo,Collectors.toList()))); grantItemCountMap = grantItemCountList.stream().collect(toMap(OfflineActivityGrantItemVo::getRecordId, Function.identity())); List recordCountIds = grantItemCountList.stream().map(OfflineActivityGrantItemVo::getRecordId).distinct().collect(toList()); + recordIds.removeAll(recordCountIds); recordIds.addAll(recordCountIds); List grantCountIds = grantItemCountList.stream().map(OfflineActivityGrantItemVo::getGrantId).distinct().collect(toList()); + grantIds.removeAll(grantCountIds); grantIds.addAll(grantCountIds); //联单表头 @@ -1873,8 +1877,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity grantItemCountRecordMap = grantItemCountList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getGrantItemId,Collectors.mapping(OfflineActivityGrantItemVo::getOrderNo,Collectors.toList()))); grantItemCountMap = grantItemCountList.stream().collect(toMap(OfflineActivityGrantItemVo::getRecordId, Function.identity())); List recordCountIds = grantItemCountList.stream().map(OfflineActivityGrantItemVo::getRecordId).distinct().collect(toList()); + recordIds.removeAll(recordCountIds); recordIds.addAll(recordCountIds); List grantCountIds = grantItemCountList.stream().map(OfflineActivityGrantItemVo::getGrantId).distinct().collect(toList()); + grantIds.removeAll(grantCountIds); grantIds.addAll(grantCountIds); //联单表头