Merge remote-tracking branch 'origin/developer' into developer

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

@@ -23,6 +23,7 @@ import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.log.api.service.LogApiService;
 import com.gic.member.api.dto.BatchTaskOperaInfDTO;
+import com.gic.member.api.dto.StoreBatchUpdateDTO;
 import com.gic.member.api.service.BatchOperationApiService;
 import com.gic.member.api.service.StoreUpdateApiService;
 import com.gic.member.api.service.UserAscriptionApiService;
@@ -455,9 +456,14 @@ public class StoreController extends DownloadUtils {
                 return ServiceResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), "该门店无店招品牌信息，请完善后再执行此操作");
             }
             Integer storeInfoId = storeDTO.getStoreInfoId();
-            List<Integer> storeInfoIdList = storeInfoList.stream().map(StoreInfoDTO::getStoreInfoId).collect(Collectors.toList());
-            ServiceResponse<Boolean> serviceResponse = userAscriptionApiService.transferStore(UserDetailUtils.getUserDetail().getEnterpriseId(), storeInfoIdList, storeInfoId, memberTransType);
-            return serviceResponse;
+            List<String> storeInfoIdList = storeInfoList.stream().map(store-> String.valueOf(store.getStoreInfoId())).collect(Collectors.toList());
+            StoreBatchUpdateDTO storeBatchUpdateDTO = new StoreBatchUpdateDTO();
+            storeBatchUpdateDTO.setUserId(UserDetailUtils.getUserDetail().getUserId());
+            storeBatchUpdateDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+            storeBatchUpdateDTO.setSourceStoreInfoIdList(storeInfoIdList);
+            storeBatchUpdateDTO.setTargetStoreInfoId(String.valueOf(storeInfoId));
+            this.storeUpdateApiService.storeBatchUpdate(storeBatchUpdateDTO);
+            return ServiceResponse.success();
         }
         return ServiceResponse.success();
     }