feat:subsidy condition

api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/CheckUnbindStudioMerchantRequest.java

@@ -23,8 +23,4 @@ public class CheckUnbindStudioMerchantRequest {
   @NotNull(message = "场馆ID不能为空")
   @NotNull(message = "场馆ID不能为空")
   private Long studioId;
   private Long studioId;
 
 
-  @ApiModelProperty(value = "商户ID", required = true)
-  @NotNull(message = "商户ID不能为空")
-  private Long merchantId;
-
 }
 }

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

@@ -75,8 +75,7 @@ public class StudioMerchantController implements StudioMerchantApi {
   @PostMapping(value = "/private/studioMerchant/checkUnbind")
   @PostMapping(value = "/private/studioMerchant/checkUnbind")
   @Override
   @Override
   public JsonResult<List<String>> checkUnbind(@RequestBody @Valid CheckUnbindStudioMerchantRequest request) {
   public JsonResult<List<String>> checkUnbind(@RequestBody @Valid CheckUnbindStudioMerchantRequest request) {
-    return JsonResult.success(
-        studioMerchantService.checkUnbind(request.getStudioId(), request.getMerchantId()));
+    return JsonResult.success(studioMerchantService.checkUnbind(request.getStudioId());
   }
   }
 
 
   @ApiOperation(value = "场馆解绑商户", tags = {TAG})
   @ApiOperation(value = "场馆解绑商户", tags = {TAG})

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

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

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

@@ -275,7 +275,12 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
   }
   }
 
 
   @Override
   @Override
-  public List<String> checkUnbind(Long studioId, Long merchantId) {
+  public List<String> checkUnbind(Long studioId) {
+    List<PartyToMerchant> relation = partyToMerchantRpService.listByParty(studioId, PartyTypeEnum.STUDIO, config.getCashier());
+    if (CollectionUtil.isEmpty(relation)) {
+      return Lists.newArrayList();
+    }
+    Long merchantId = relation.stream().findFirst().orElse(new PartyToMerchant()).getMerchantId();
     List<PartyToMerchant> merchants = partyToMerchantRpService.listByMerchantIdAndPartyType(merchantId,
     List<PartyToMerchant> merchants = partyToMerchantRpService.listByMerchantIdAndPartyType(merchantId,
         PartyTypeEnum.STUDIO);
         PartyTypeEnum.STUDIO);
     if (CollectionUtil.isEmpty(merchants)) {
     if (CollectionUtil.isEmpty(merchants)) {