|
@@ -1829,16 +1829,16 @@ public class ApiController {
|
|
|
.map(WmScorePackageApiOutput::getId).collect(Collectors.toSet());
|
|
|
List<WmScorePackageSettleNote> settleNotes = wmScorePackageSettleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
|
|
|
.in(WmScorePackageSettleNote::getPackageId, scorePackageIds));
|
|
|
- Map<String, WmScorePackageSettleNote> settelMap = new HashMap<>();
|
|
|
+ Map<String, List<WmScorePackageSettleNote>> settelMap = new HashMap<>();
|
|
|
if (CollUtil.isNotEmpty(settleNotes)) {
|
|
|
settelMap = settleNotes.stream()
|
|
|
- .collect(Collectors.toMap(WmScorePackageSettleNote::getPackageId, Function.identity()));
|
|
|
+ .collect(Collectors.groupingBy(WmScorePackageSettleNote::getPackageId));
|
|
|
}
|
|
|
// Map<String, Object> map = new HashMap<>();
|
|
|
for (WmScorePackageApiOutput item : scorePackageList) {
|
|
|
if (PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(item.getPackageType1())) {
|
|
|
// 只处理积分包的情况
|
|
|
- WmScorePackageSettleNote settleNote = settelMap.get(item.getId());
|
|
|
+ WmScorePackageSettleNote settleNote = settelMap.get(item.getId()).get(0);
|
|
|
if (settleNote != null) {
|
|
|
item.setNotifyTime(settleNote.getNotifyTime());
|
|
|
item.setSettleNoteStatus(String.valueOf(settleNote.getSettleNoteStatus()));
|