From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
index 34f2c0d..c60d1f6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
@@ -58,6 +58,26 @@
}
Constants.DEALING_HK_NOTICE_LIST =true;
try {
+ List<String> users = new ArrayList<>();
+ users.add(username);
+
+ List<Integer> userIds = new ArrayList<>();
+ List<Member > userList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .in(Member::getPhone,users)
+ .eq(Member::getType,Constants.TWO)
+ .eq(Member::getIsdeleted,Constants.ZERO));
+ Member tu= getFromUserList(username,userList);
+ if(tu!=null){
+ userIds.add(tu.getId());
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鏃犳晥璐﹀彿~");
+ }
+ if(userIds.size()>0){
+ //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
+ noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
+ .eq(Notices::getType, Constants.noticesObjectType.hknotice)
+ .in(Notices::getUserId, userIds));
+ }
Date date = new Date();
List<GetTodoListResponse> allHkList = new ArrayList<>();
boolean hasNext = true;
@@ -88,16 +108,10 @@
}
curPage++;
}
- if(allHkList!=null && allHkList.size()>0){
- List<Notices> list = new ArrayList<>();
- List<String> users = new ArrayList<>();
- for(GetTodoListResponse data :allHkList){
- users.add(data.getUserId());
- }
- List<Integer> userIds = new ArrayList<>();
- List<Member > userList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
- .in(Member::getPhone,users)
- .eq(Member::getIsdeleted,Constants.ZERO));
+
+
+ if(allHkList!=null && allHkList.size()>0){
+ List<Notices> list = new ArrayList<>();
for(GetTodoListResponse data :allHkList){
Member u = getFromUserList(data.getUserId(),userList);
if(u==null){
@@ -132,11 +146,7 @@
notices.setType(Constants.noticesObjectType.hknotice);
list.add(notices);
}
- if(list.size()>0){
- //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
- noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
- .eq(Notices::getType, Constants.noticesObjectType.hknotice)
- .in(Notices::getUserId, userIds));
+ if(list.size()>0){
noticesJoinMapper.insert(list);//鎵归噺鎻掑叆璁板綍
}
}
--
Gitblit v1.9.3