|
|
|
@@ -181,21 +181,22 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
|
|
|
|
//订单参数处理 |
|
|
|
List<WxOfflineActivityItem> activityItemList = wxOfflineActivityItemService.getActivityItemList(activity.getId(), activity.getTenantId()); |
|
|
|
Map<Long, List<Long>> activityItemRecordMap = new HashMap<>(); |
|
|
|
if(wxOfflineActivityGrantAward.getActivityItemList() != null && !wxOfflineActivityGrantAward.getActivityItemList().isEmpty()){ |
|
|
|
Map<Long, List<Long>> ActivityItemRecordMap = wxOfflineActivityGrantAward.getActivityItemList().stream().collect(toMap(WxOfflineActivityItem::getId, WxOfflineActivityItem::getRecordIds)); |
|
|
|
for (WxOfflineActivityItem activityItem : activityItemList) { |
|
|
|
if(EnumOfflineActivityMode.CONDITION_SUM.getCode().equals(activityItem.getModeType())){ |
|
|
|
List<Long> records = ActivityItemRecordMap.get(activityItem.getId()); |
|
|
|
if(records == null || records.isEmpty()){ |
|
|
|
throw new MallinkException(Result.ERROR, "发奖未选择订单"); |
|
|
|
} |
|
|
|
activityItem.setRecordIds(records); |
|
|
|
List<WxOfflineActivityRecord> collect = wxOfflineActivityGrantAward.getRecordList().stream() |
|
|
|
.filter(record -> activityItem.getRecordIds().contains(record.getId())).collect(toList()); |
|
|
|
activityItem.setRecordList(collect); |
|
|
|
}else{ |
|
|
|
activityItem.setRecordList(wxOfflineActivityGrantAward.getRecordList()); |
|
|
|
activityItemRecordMap = wxOfflineActivityGrantAward.getActivityItemList().stream().collect(toMap(WxOfflineActivityItem::getId, WxOfflineActivityItem::getRecordIds)); |
|
|
|
} |
|
|
|
for (WxOfflineActivityItem activityItem : activityItemList) { |
|
|
|
if(EnumOfflineActivityMode.CONDITION_SUM.getCode().equals(activityItem.getModeType())){ |
|
|
|
List<Long> records = activityItemRecordMap.get(activityItem.getId()); |
|
|
|
if(records == null || records.isEmpty()){ |
|
|
|
throw new MallinkException(Result.ERROR, "发奖未选择订单"); |
|
|
|
} |
|
|
|
activityItem.setRecordIds(records); |
|
|
|
List<WxOfflineActivityRecord> collect = wxOfflineActivityGrantAward.getRecordList().stream() |
|
|
|
.filter(record -> activityItem.getRecordIds().contains(record.getId())).collect(toList()); |
|
|
|
activityItem.setRecordList(collect); |
|
|
|
}else{ |
|
|
|
activityItem.setRecordList(wxOfflineActivityGrantAward.getRecordList()); |
|
|
|
} |
|
|
|
} |
|
|
|
wxOfflineActivityGrantAward.setActivityItemList(activityItemList); |
|
|
|
@@ -687,17 +688,18 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
if(wxOfflineActivityGrantAward.getActivityItemList() == null){ |
|
|
|
throw new MallinkException(Result.ERROR, "请检查活动项参数"); |
|
|
|
} |
|
|
|
Map<Long, WxOfflineActivityItem> grantActivityItemMap = wxOfflineActivityGrantAward.getActivityItemList().stream().collect(toMap(WxOfflineActivityItem::getId, Function.identity())); |
|
|
|
Map<Long, WxOfflineActivityItem> grantActivityItemMap = new HashMap<>(); |
|
|
|
if(wxOfflineActivityGrantAward.getActivityItemList() != null && !wxOfflineActivityGrantAward.getActivityItemList().isEmpty()){ |
|
|
|
grantActivityItemMap = wxOfflineActivityGrantAward.getActivityItemList().stream().collect(toMap(WxOfflineActivityItem::getId, Function.identity())); |
|
|
|
} |
|
|
|
|
|
|
|
List<WxOfflineActivityItem> activityItemList = wxOfflineActivityItemService.getActivityItemList(activity.getId(), activity.getTenantId()); |
|
|
|
|
|
|
|
|
|
|
|
int i = 0;//检查活动奖项 |
|
|
|
|
|
|
|
for (WxOfflineActivityItem activityItem : activityItemList) { |
|
|
|
|
|
|
|
Map<Long, WxOfflineActivityAwardsItem> awardsItemMap = activityItem.getActivityAwardsItemList().stream().collect(toMap(WxOfflineActivityAwardsItem::getId, Function.identity())); |
|
|
|
|
|
|
|
WxOfflineActivityItem grantActivityItem = grantActivityItemMap.get(activityItem.getId()); |
|
|
|
//订单参数处理 |
|
|
|
if(EnumOfflineActivityMode.CONDITION_SUM.getCode().equals(activityItem.getModeType())){ |
|
|
|
|