|
@@ -833,22 +833,16 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
|
WmScorePackageSettleNote tmp = noteList.get(0);
|
|
|
if (CollectionUtils.isNotEmpty(noteList)) {
|
|
|
log.info("回调成功,流水号{}", streamId);
|
|
|
- if (izSingle) {
|
|
|
+
|
|
|
+ List<WmScorePackageSettleNote> updateList = noteList.stream().map(note -> {
|
|
|
WmScorePackageSettleNote updateEntity = new WmScorePackageSettleNote();
|
|
|
- updateEntity.setId(tmp.getId());
|
|
|
+ updateEntity.setId(izSingle ? tmp.getId() : note.getId());
|
|
|
updateEntity.setSettleNoteStatus(settleStatus);
|
|
|
updateEntity.setNotifyTime(LocalDateTime.now());
|
|
|
- this.baseMapper.updateById(updateEntity);
|
|
|
- } else {
|
|
|
- List<WmScorePackageSettleNote> updateList = noteList.stream().map(note -> {
|
|
|
- WmScorePackageSettleNote updateEntity = new WmScorePackageSettleNote();
|
|
|
- updateEntity.setId(note.getId());
|
|
|
- updateEntity.setSettleNoteStatus(settleStatus);
|
|
|
- updateEntity.setNotifyTime(LocalDateTime.now());
|
|
|
- return updateEntity;
|
|
|
- }).collect(Collectors.toList());
|
|
|
- this.saveBatch(updateList);
|
|
|
- }
|
|
|
+ return updateEntity;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+
|
|
|
+ this.saveBatch(updateList);
|
|
|
|
|
|
// 更新积分包状态
|
|
|
log.info("更新积分包状态:{}", tmp);
|
|
@@ -859,7 +853,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
|
wmScorePackageMapper.updateById(wmScorePackage);
|
|
|
|
|
|
// 如果结算失败删除缓存
|
|
|
- if (settleStatus == 2 ){
|
|
|
+ if (settleStatus == 2) {
|
|
|
redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + tmp.getId());
|
|
|
}
|
|
|
|