批量修改活码

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmClerkRelationServiceImpl.java

@@ -166,38 +166,38 @@ public class HmClerkRelationServiceImpl implements HmClerkRelationService {
                 errList.add(err) ;
                 continue;
             }
-            Set<String> staffIdSet = staffRelationList.stream().map(o->o.getStaffId()).collect(Collectors.toSet()) ;
+            Set<String> clerkIdSet = staffRelationList.stream().map(o->o.getClerkId()).collect(Collectors.toSet()) ;
             if(CollectionUtils.isNotEmpty(staffRelationList)) {
-                Set<String> staffIdSetBak = new HashSet<>();
-                staffIdSetBak.addAll(staffIdSet) ;
+                Set<String> clerkIdSetBak = new HashSet<>();
+                clerkIdSetBak.addAll(clerkIdSet) ;
                 List<String> modifyIdList = qdto.getClerkIdList();
                 // add
                 if(qdto.getOptType()==1) {
-                    staffIdSetBak.addAll(modifyIdList) ;
-                    if(staffIdSetBak.size()>maxCount) {
+                    clerkIdSetBak.addAll(modifyIdList) ;
+                    if(clerkIdSetBak.size()>maxCount) {
                         HmBatchModifyResultDTO err = new HmBatchModifyResultDTO(hmId,1,"超出多人活码成员数上限,最多支持添加100个成员") ;
                         errList.add(err) ;
                     }
                 }
                 // 减
                 if(qdto.getOptType()==2) {
-                    staffIdSetBak.removeAll(modifyIdList);
-                    if(staffIdSetBak.size()<=0) {
+                    clerkIdSetBak.removeAll(modifyIdList);
+                    if(clerkIdSetBak.size()<=0) {
                         HmBatchModifyResultDTO err = new HmBatchModifyResultDTO(hmId,2,"成员数为0") ;
                         errList.add(err) ;
                     }
                 }
                 //  1 继续执行更新 2不废弃活码
-                if(qdto.getUpdateType()==2 && staffIdSetBak.size()==0) {
+                if(qdto.getUpdateType()==2 && clerkIdSetBak.size()==0) {
                     log.info("无人活码={}",hmId);
                     continue ;
                 }
-                if(staffIdSet.size()>maxCount) {
+                if(clerkIdSet.size()>maxCount) {
                     log.info("超人数活码={}",hmId);
                     continue ;
                 }
-                if(staffIdSetBak.size() != staffIdSet.size()) {
-                    modifyMap.put(hmId, staffIdSetBak) ;
+                if(clerkIdSetBak.size() != clerkIdSet.size()) {
+                    modifyMap.put(hmId, clerkIdSetBak) ;
                 }
             }
         }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/hm/QwHmOperation.java

@@ -36,6 +36,7 @@ public class QwHmOperation implements BaseSyncOperation {
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
         String taskId = dealParamMqDTO.getTaskId();
         Long hmId = Long.valueOf(dataPre.getDataId());
+        logger.info("开始处理活码={},{}",taskId,hmId);
         String clerkIds = dataPre.getDataContent();
         String wxEnterpriseId = dataPre.getWxEnterpriseId();
         String enterpriseId = dataPre.getEnterpriseId();