Merge branch 'hotfix-210729' of googol/YY_BE_2 into master

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageSettleNoteServiceImpl.java

@@ -830,12 +830,12 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		WmScorePackageSettleNote query = new WmScorePackageSettleNote();
 		query.setStreamId(streamId);
 		List<WmScorePackageSettleNote> noteList = this.baseMapper.selectList(Wrappers.query(query));
-
+		WmScorePackageSettleNote tmp = noteList.get(0);
 		if (CollectionUtils.isNotEmpty(noteList)) {
 			log.info("回调成功，流水号{}", streamId);
 			if (izSingle) {
 				WmScorePackageSettleNote updateEntity = new WmScorePackageSettleNote();
-				updateEntity.setId(noteList.get(0).getId());
+				updateEntity.setId(tmp.getId());
 				updateEntity.setSettleNoteStatus(1);
 				updateEntity.setNotifyTime(LocalDateTime.now());
 				this.baseMapper.updateById(updateEntity);
@@ -850,6 +850,14 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				this.saveBatch(updateList);
 			}
 
+			// 更新积分包状态
+			log.info("更新积分包状态:{}", tmp);
+			WmScorePackage wmScorePackage = new WmScorePackage();
+			wmScorePackage.setId(tmp.getPackageId());
+			wmScorePackage.setSettleStatus(1);
+			wmScorePackage.setUpdateTime(LocalDateTime.now());
+			wmScorePackageMapper.updateById(wmScorePackage);
+
 		} else {
 			log.info("回调成功，流水号异常： {}", streamId);
 		}