转移门店

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -51,8 +51,8 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 /**
  * @author zhiwj
@@ -461,11 +461,18 @@ public class StoreController extends DownloadUtils {
 
     @RequestMapping("transfer-store-member")
     public RestResponse transferStoreMember(String storeId, Integer toStoreId){
-        List<String> list = Arrays.asList(storeId.split(","));
+        // 把参数改成storeInfoId
+        StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
+        storeSearchDTO.setStoreIds(storeId.replace(',', ' '));
+        List<String> list = this.storeApiService.listStore(storeSearchDTO, 1, 1000, "storeInfoId").getResult().getResult()
+                .stream().map(e -> e.getStoreInfoId().toString()).collect(Collectors.toList());
+        Integer storeInfoId = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), toStoreId).getResult().getStoreInfoId();
+
+//        List<String> list = Arrays.asList(storeId.split(","));
         StoreBatchUpdateDTO storeBatchUpdateDTO = new StoreBatchUpdateDTO();
         storeBatchUpdateDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         storeBatchUpdateDTO.setSourceStoreIdList(list);
-        storeBatchUpdateDTO.setTargetStoreId(toStoreId+"");
+        storeBatchUpdateDTO.setTargetStoreId(storeInfoId+"");
         storeBatchUpdateDTO.setUserId(UserDetailUtils.getUserDetail().getUserId());
         logger.info("transfer-store-member:{}", JSON.toJSONString(storeBatchUpdateDTO));
         ServiceResponse<Void> response = this.storeUpdateApiService.storeBatchUpdate(storeBatchUpdateDTO);