|
@@ -1838,8 +1838,9 @@ public class ApiController {
|
|
for (WmScorePackageApiOutput item : scorePackageList) {
|
|
for (WmScorePackageApiOutput item : scorePackageList) {
|
|
if (PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(item.getPackageType1())) {
|
|
if (PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(item.getPackageType1())) {
|
|
// 只处理积分包的情况
|
|
// 只处理积分包的情况
|
|
- WmScorePackageSettleNote settleNote = settelMap.get(item.getId()).get(0);
|
|
|
|
- if (settleNote != null) {
|
|
|
|
|
|
+ List<WmScorePackageSettleNote> settleNoteList = settelMap.get(item.getId());
|
|
|
|
+ if (CollUtil.isNotEmpty(settleNoteList)) {
|
|
|
|
+ WmScorePackageSettleNote settleNote = settleNoteList.get(0);
|
|
item.setNotifyTime(settleNote.getNotifyTime());
|
|
item.setNotifyTime(settleNote.getNotifyTime());
|
|
item.setSettleNoteStatus(String.valueOf(settleNote.getSettleNoteStatus()));
|
|
item.setSettleNoteStatus(String.valueOf(settleNote.getSettleNoteStatus()));
|
|
}
|
|
}
|