From 3b052765e31a724fa2ab40156e38f63694d917f0 Mon Sep 17 00:00:00 2001 From: Guava Date: Wed, 5 Jul 2023 12:10:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81=E6=92=A4?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CasesRecommendPushRecordServiceImpl.java | 10 ++++++---- .../service/impl/CasesRecommendServiceImpl.java | 9 +++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java index 748a7748..d8c004a3 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java @@ -171,11 +171,13 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR } if (isWithdraw) { List recordList = findAllByRecommendId(casesRecommend.getId()); - recordList.stream().forEach(record -> - record.setPushStatus(CasesPushStatusEnum.PUSH_REVOKE.getStatus()) - ); if (CollectionUtil.isNotEmpty(recordList)) { - casesRecommendPushRecordDao.saveList(recordList); + List 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 { diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendServiceImpl.java index df000314..753b9587 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendServiceImpl.java @@ -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()));