feat:latest success apply

api/src/main/java/com/jiejing/fitness/finance/api/merchant/StudioMerchantApi.java

@@ -48,7 +48,7 @@ public interface StudioMerchantApi {
 
 
   @ApiOperation(value = "解绑前置校验请求", tags = {TAG})
   @ApiOperation(value = "解绑前置校验请求", tags = {TAG})
   @PostMapping(value = "/private/studioMerchant/checkUnbind")
   @PostMapping(value = "/private/studioMerchant/checkUnbind")
-  JsonResult<Boolean> checkUnbind(CheckUnbindStudioMerchantRequest request);
+  JsonResult<List<String>> checkUnbind(CheckUnbindStudioMerchantRequest request);
 
 
   @ApiOperation(value = "场馆解绑商户", tags = {TAG})
   @ApiOperation(value = "场馆解绑商户", tags = {TAG})
   @PostMapping(value = "/private/studioMerchant/unbind")
   @PostMapping(value = "/private/studioMerchant/unbind")

api/src/main/java/com/jiejing/fitness/finance/api/merchant/StudioMerchantApiFallback.java

@@ -50,7 +50,7 @@ public class StudioMerchantApiFallback implements FallbackFactory<StudioMerchant
       }
       }
 
 
       @Override
       @Override
-      public JsonResult<Boolean> checkUnbind(CheckUnbindStudioMerchantRequest request) {
+      public JsonResult<List<String>> checkUnbind(CheckUnbindStudioMerchantRequest request) {
         return JsonResult.rpcError();
         return JsonResult.rpcError();
       }
       }
 
 

app/src/main/java/com/jiejing/fitness/finance/app/controller/merchant/StudioMerchantController.java

@@ -74,7 +74,7 @@ public class StudioMerchantController implements StudioMerchantApi {
   @ApiOperation(value = "解绑前置校验请求", tags = {TAG})
   @ApiOperation(value = "解绑前置校验请求", tags = {TAG})
   @PostMapping(value = "/private/studioMerchant/checkUnbind")
   @PostMapping(value = "/private/studioMerchant/checkUnbind")
   @Override
   @Override
-  public JsonResult<Boolean> checkUnbind(@RequestBody @Valid CheckUnbindStudioMerchantRequest request) {
+  public JsonResult<List<String>> checkUnbind(@RequestBody @Valid CheckUnbindStudioMerchantRequest request) {
     return JsonResult.success(
     return JsonResult.success(
         studioMerchantService.checkUnbind(request.getStudioId(), request.getMerchantId()));
         studioMerchantService.checkUnbind(request.getStudioId(), request.getMerchantId()));
   }
   }

service/src/main/java/com/jiejing/fitness/finance/service/merchant/StudioMerchantService.java

@@ -134,7 +134,7 @@ public interface StudioMerchantService {
    * @param merchantId 商户ID
    * @param merchantId 商户ID
    * @return true：绑定过其他场馆；false-没有绑定过
    * @return true：绑定过其他场馆；false-没有绑定过
    */
    */
-  Boolean checkUnbind(Long studioId, Long merchantId);
+  List<String> checkUnbind(Long studioId, Long merchantId);
 
 
   /**
   /**
    * 获取最后一条成功的申请记录
    * 获取最后一条成功的申请记录

service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java

@@ -2,6 +2,7 @@ package com.jiejing.fitness.finance.service.merchant.impl;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.google.common.collect.Lists;
 import com.jiejing.common.exception.BizException;
 import com.jiejing.common.exception.BizException;
 import com.jiejing.common.model.PageVO;
 import com.jiejing.common.model.PageVO;
 import com.jiejing.common.utils.collection.CollectionUtil;
 import com.jiejing.common.utils.collection.CollectionUtil;
@@ -274,12 +275,18 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
   }
   }
 
 
   @Override
   @Override
-  public Boolean checkUnbind(Long studioId, Long merchantId) {
-    List<PartyToMerchant> merchants = partyToMerchantRpService.listByMerchantIdAndPartyType(merchantId, PartyTypeEnum.STUDIO);
-    return Optional.ofNullable(merchants)
-        .orElse(new ArrayList<>(1))
+  public List<String> checkUnbind(Long studioId, Long merchantId) {
+    List<PartyToMerchant> merchants = partyToMerchantRpService.listByMerchantIdAndPartyType(merchantId,
+        PartyTypeEnum.STUDIO);
+    if (CollectionUtil.isEmpty(merchants)) {
+      return Lists.newArrayList();
+    }
+    return studioRpcService.listStudio(
+            merchants.stream().map(PartyToMerchant::getPartyId).collect(Collectors.toList()))
         .stream()
         .stream()
-        .anyMatch(e -> !e.getPartyId().equals(studioId));
+        .filter(e -> !e.getId().equals(studioId))
+        .map(StudioVO::getName)
+        .collect(Collectors.toList());
   }
   }
 
 
   @Override
   @Override