门店品牌变更

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -509,25 +509,28 @@ public class ClerkApiServiceImpl implements ClerkApiService {
                 }
             }
             if(CollectionUtils.isNotEmpty(clerkIdList)){
-                List<ClerkOfflineDTO> clerkOfflineDTOList = new ArrayList<>();
-                List<Integer> needDealClerkIdList = new ArrayList<>();
-                for(Integer clerkId : clerkIdList){
-                    List<TabClerk> list = this.clerkService.listClerkByStoreInfoId(Collections.singletonList(clerkIdMap.get(clerkId).getStoreInfoId()));
-                    if(list.size() > 1){
-                        ClerkOfflineDTO clerkOfflineDTO = new ClerkOfflineDTO();
-                        clerkOfflineDTO.setDelClerkId(clerkId);
-                        Integer addClerkId = list.stream().filter(clerk -> !clerk.getClerkId().equals(clerkId)).findFirst().get().getClerkId();
-                        clerkOfflineDTO.setAddClerkId(addClerkId);
-                        clerkOfflineDTOList.add(clerkOfflineDTO);
-                    }else {
-                        messageBuiler.append("当前门店下只有 ").append(clerkIdMap.get(clerkId).getClerkName()).append(" 是上线状态；");
-                    }
-                }
-                Integer i = clerkService.updateClerkStatus(enterpriseId, needDealClerkIdList, status);
                 if(StoreStatusEnum.INONLINE.getCode() == status){
+                    List<Integer> needDealClerkIdList = new ArrayList<>();
+                    List<ClerkOfflineDTO> clerkOfflineDTOList = new ArrayList<>();
+                    for(Integer clerkId : clerkIdList){
+                        List<TabClerk> list = this.clerkService.listClerkByStoreInfoId(Collections.singletonList(clerkIdMap.get(clerkId).getStoreInfoId()));
+                        if(list.size() > 1){
+                            ClerkOfflineDTO clerkOfflineDTO = new ClerkOfflineDTO();
+                            clerkOfflineDTO.setDelClerkId(clerkId);
+                            Integer addClerkId = list.stream().filter(clerk -> !clerk.getClerkId().equals(clerkId)).findFirst().get().getClerkId();
+                            clerkOfflineDTO.setAddClerkId(addClerkId);
+                            clerkOfflineDTOList.add(clerkOfflineDTO);
+                            needDealClerkIdList.add(clerkId);
+                        }else {
+                            messageBuiler.append("当前门店下只有 ").append(clerkIdMap.get(clerkId).getClerkName()).append(" 是上线状态；");
+                        }
+                    }
+                    clerkService.updateClerkStatus(enterpriseId, needDealClerkIdList, status);
                     //导购下线重算导购归属
                     logger.info("导购下线 重算归属:{}", JSON.toJSONString(clerkOfflineDTOList));
                     this.storeUpdateApiService.clerkOffline(enterpriseId, clerkOfflineDTOList, userId);
+                }else {
+                    clerkService.updateClerkStatus(enterpriseId, clerkIdList, status);
                 }
             }
         }