门店

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

@@ -632,44 +632,23 @@ public class StoreController extends DownloadUtils {
     }
 
     @RequestMapping("transfer-store-member")
-    public RestResponse transferStoreMember(String storeId, Integer toStoreId){
+    public RestResponse transferStoreMember(String storeId, Integer toStoreId, Integer memberTransType){
         RedissonClient redisClient = RedisUtil.getRedisClient();
         RMap<Integer, String> cacheMap = redisClient.getMap("enterprise:store:transfermember:process");
         String cacheStoreId = cacheMap.get(UserDetailUtils.getUserDetail().getEnterpriseId());
         if (StringUtils.isNotBlank(cacheStoreId)) {
             return RestResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "请其他门店会员转移完毕后再试");
         }
-
-        // 把参数改成storeInfoId
-        StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
-        storeSearchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
-        List<StoreDTO> storeInfoList;
-        if (StringUtils.equals(storeId, Constants.ALL)) {
-            storeInfoList = this.storeApiService.listStore(storeSearchDTO, 1, 10000, "storeInfoId").getResult().getResult();
-
-        } else {
-            storeSearchDTO.setStoreIds(storeId.replace(',', ' '));
-            storeInfoList = this.storeApiService.listStore(storeSearchDTO, 1, storeId.split(" ").length, "storeInfoId").getResult().getResult();
-        }
-        List<String> list = storeInfoList.stream().map(e -> e.getStoreInfoId().toString()).collect(Collectors.toList());
-        Integer storeInfoId = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), toStoreId).getResult().getStoreInfoId();
-
-        StoreBatchUpdateDTO storeBatchUpdateDTO = new StoreBatchUpdateDTO();
-        storeBatchUpdateDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
-        storeBatchUpdateDTO.setSourceStoreInfoIdList(list);
-        storeBatchUpdateDTO.setTargetStoreInfoId(storeInfoId+"");
-        storeBatchUpdateDTO.setUserId(UserDetailUtils.getUserDetail().getUserId());
-        logger.info("transfer-store-member:{}", JSON.toJSONString(storeBatchUpdateDTO));
-        ServiceResponse<Void> response = this.storeUpdateApiService.storeBatchUpdate(storeBatchUpdateDTO);
-        logger.info("transfer-store-member-result:{}", JSON.toJSONString(response));
+        tranMemberStore(storeId, toStoreId, memberTransType);
         cacheMap.put(UserDetailUtils.getUserDetail().getEnterpriseId(), storeId);
-        for (String store : list) {
+        String[] split = storeId.split(",");
+        for (String store : split) {
             StoreDTO storeDTO = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), Integer.valueOf(store)).getResult();
             if (storeDTO != null) {
                 LogUtils.createLog("会员处理", storeDTO.getStoreName());
             }
         }
-        return EnterpriseRestResponse.failure(response);
+        return EnterpriseRestResponse.success();
     }
 
     @RequestMapping("process-store-member")