修改推送撤回

This commit is contained in:
Guava
2023-07-05 12:10:19 +08:00
parent b9de25d91a
commit 3b052765e3
2 changed files with 13 additions and 6 deletions

View File

@@ -171,11 +171,13 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR
}
if (isWithdraw) {
List<CasesRecommendPushRecord> recordList = findAllByRecommendId(casesRecommend.getId());
recordList.stream().forEach(record ->
record.setPushStatus(CasesPushStatusEnum.PUSH_REVOKE.getStatus())
);
if (CollectionUtil.isNotEmpty(recordList)) {
casesRecommendPushRecordDao.saveList(recordList);
List<String> pushIds = recordList.stream().map(CasesRecommendPushRecord::getId).collect(Collectors.toList());
casesRecommendPushRecordDao.update(UpdateBuilder.from(CasesRecommendPushRecord.class)
.addUpdateField("pushStatus", CasesPushStatusEnum.PUSH_REVOKE.getStatus())
.addUpdateField("readFlag", 0)
.addFilter(FieldFilters.in("id", pushIds))
.builder());
}
} else {
try {

View File

@@ -70,10 +70,15 @@ public class CasesRecommendServiceImpl implements ICasesRecommendService {
|| CasesPushStatusEnum.WAIT_PUSH.getStatus().equals(db.getPushProgress())
|| CasesPushStatusEnum.PUSH_ING.getStatus().equals(db.getPushProgress())
) {
// 当为推送成功时为
iCasesRecommendPushRecordService.rePushOrWithdraw(true, db);
db.setPushProgress(CasesPushStatusEnum.PUSH_REVOKE.getStatus());
casesRecommendDao.update(db);
casesRecommendDao.update(UpdateBuilder.from(CasesRecommend.class)
.addUpdateField("pushProgress", CasesPushStatusEnum.PUSH_REVOKE.getStatus())
.addFilter(FieldFilters.eq("id", db.getId()))
.builder());
messageDao.deleteByFilter(FieldFilters.eq("acceptId", userId), FieldFilters.eq("refType", "99"),
FieldFilters.eq("batchId", casesRecommendPushVo.getCasesRecommendId()));