门店品牌变更

gic-store-api/src/main/java/com/gic/store/dto/ClerkOfflineDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+
+public class ClerkOfflineDTO implements Serializable {
+    private Integer delClerkId;
+    private Integer addClerkId;
+
+    public Integer getDelClerkId() {
+        return delClerkId;
+    }
+
+    public void setDelClerkId(Integer delClerkId) {
+        this.delClerkId = delClerkId;
+    }
+
+    public Integer getAddClerkId() {
+        return addClerkId;
+    }
+
+    public void setAddClerkId(Integer addClerkId) {
+        this.addClerkId = addClerkId;
+    }
+}

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

@@ -508,11 +508,16 @@ 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(Arrays.asList(clerkIdMap.get(clerkId).getStoreInfoId()));
+                    List<TabClerk> list = this.clerkService.listClerkByStoreInfoId(Collections.singletonList(clerkIdMap.get(clerkId).getStoreInfoId()));
                     if(list.size() > 1){
-                        needDealClerkIdList.add(clerkId);
+                        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(" 是上线状态；");
                     }
@@ -520,7 +525,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
                 Integer i = clerkService.updateClerkStatus(enterpriseId, needDealClerkIdList, status);
                 if(StoreStatusEnum.INONLINE.getCode() == status){
                     //导购下线重算导购归属
-                    this.storeUpdateApiService.clerkOffline(enterpriseId, needDealClerkIdList, userId);
+                    this.storeUpdateApiService.clerkOffline(enterpriseId, clerkOfflineDTOList, userId);
                 }
             }
         }