feat:brand -> studio

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

@@ -4,12 +4,14 @@ import com.jiejing.common.model.JsonResult;
 import com.jiejing.common.model.PageVO;
 import com.jiejing.fitness.finance.api.merchant.request.ApplyStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.request.AuthStudioSubChannelRequest;
+import com.jiejing.fitness.finance.api.merchant.request.BindStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.request.BindStudioMerchantXcxAppIdRequest;
 import com.jiejing.fitness.finance.api.merchant.request.GetAuthStudioSubChannelRequest;
 import com.jiejing.fitness.finance.api.merchant.request.GetStudioMerchantApplyRequest;
 import com.jiejing.fitness.finance.api.merchant.request.GetStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.request.PageStudioMerchantApplyRequest;
 import com.jiejing.fitness.finance.api.merchant.request.StudioMerchantPayRequest;
+import com.jiejing.fitness.finance.api.merchant.request.UnbindStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantApplyVO;
 import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantAuthSubChannelVO;
 import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantBindXcxAppIdVO;
@@ -37,6 +39,14 @@ public interface StudioMerchantApi {
   @PostMapping(value = "/private/studioMerchant/apply")
   JsonResult<Void> apply(ApplyStudioMerchantRequest request);
 
+  @ApiOperation(value = "场馆绑定商户", tags = {TAG})
+  @PostMapping(value = "/private/studioMerchant/bind")
+  JsonResult<Void> bind(BindStudioMerchantRequest request);
+
+  @ApiOperation(value = "场馆解绑商户", tags = {TAG})
+  @PostMapping(value = "/private/studioMerchant/unbind")
+  JsonResult<Void> unbind(UnbindStudioMerchantRequest request);
+
   @ApiOperation(value = "查询场馆进件申请记录", tags = {TAG})
   @PostMapping(value = "/private/studioMerchant/getApply")
   JsonResult<StudioMerchantApplyVO> getApply(GetStudioMerchantApplyRequest request);

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

@@ -4,12 +4,14 @@ import com.jiejing.common.model.JsonResult;
 import com.jiejing.common.model.PageVO;
 import com.jiejing.fitness.finance.api.merchant.request.ApplyStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.request.AuthStudioSubChannelRequest;
+import com.jiejing.fitness.finance.api.merchant.request.BindStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.request.BindStudioMerchantXcxAppIdRequest;
 import com.jiejing.fitness.finance.api.merchant.request.GetAuthStudioSubChannelRequest;
 import com.jiejing.fitness.finance.api.merchant.request.GetStudioMerchantApplyRequest;
 import com.jiejing.fitness.finance.api.merchant.request.GetStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.request.PageStudioMerchantApplyRequest;
 import com.jiejing.fitness.finance.api.merchant.request.StudioMerchantPayRequest;
+import com.jiejing.fitness.finance.api.merchant.request.UnbindStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantApplyVO;
 import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantAuthSubChannelVO;
 import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantBindXcxAppIdVO;
@@ -40,6 +42,16 @@ public class StudioMerchantApiFallback implements FallbackFactory<StudioMerchant
       }
 
       @Override
+      public JsonResult<Void> bind(BindStudioMerchantRequest request) {
+        return JsonResult.rpcError();
+      }
+
+      @Override
+      public JsonResult<Void> unbind(UnbindStudioMerchantRequest request) {
+        return JsonResult.rpcError();
+      }
+
+      @Override
       public JsonResult<StudioMerchantApplyVO> getApply(GetStudioMerchantApplyRequest request) {
         return JsonResult.rpcError();
       }

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

+package com.jiejing.fitness.finance.api.merchant.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chengyubing
+ * @since 2024/3/5 13:39
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "场馆绑定商户请求")
+public class BindStudioMerchantRequest {
+
+  @ApiModelProperty(value = "场馆ID", required = true)
+  @NotNull(message = "场馆ID不能为空")
+  private Long studioId;
+
+  @ApiModelProperty(value = "商户ID", required = true)
+  @NotNull(message = "商户ID不能为空")
+  private Long merchantId;
+
+}

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

+package com.jiejing.fitness.finance.api.merchant.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chengyubing
+ * @since 2024/3/5 13:39
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "场馆解绑商户请求")
+public class UnbindStudioMerchantRequest {
+
+  @ApiModelProperty(value = "场馆ID", required = true)
+  @NotNull(message = "场馆ID不能为空")
+  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

@@ -6,12 +6,14 @@ import com.jiejing.common.utils.convert.BeanUtil;
 import com.jiejing.fitness.finance.api.merchant.StudioMerchantApi;
 import com.jiejing.fitness.finance.api.merchant.request.ApplyStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.request.AuthStudioSubChannelRequest;
+import com.jiejing.fitness.finance.api.merchant.request.BindStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.request.BindStudioMerchantXcxAppIdRequest;
 import com.jiejing.fitness.finance.api.merchant.request.GetAuthStudioSubChannelRequest;
 import com.jiejing.fitness.finance.api.merchant.request.GetStudioMerchantApplyRequest;
 import com.jiejing.fitness.finance.api.merchant.request.GetStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.request.PageStudioMerchantApplyRequest;
 import com.jiejing.fitness.finance.api.merchant.request.StudioMerchantPayRequest;
+import com.jiejing.fitness.finance.api.merchant.request.UnbindStudioMerchantRequest;
 import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantApplyVO;
 import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantAuthSubChannelVO;
 import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantBindXcxAppIdVO;
@@ -59,6 +61,22 @@ public class StudioMerchantController implements StudioMerchantApi {
     return JsonResult.success();
   }
 
+  @ApiOperation(value = "场馆绑定商户", tags = {TAG})
+  @PostMapping(value = "/private/studioMerchant/bind")
+  @Override
+  public JsonResult<Void> bind(@RequestBody @Valid BindStudioMerchantRequest request) {
+    studioMerchantService.bind(request.getStudioId(), request.getMerchantId());
+    return JsonResult.success();
+  }
+
+  @ApiOperation(value = "场馆解绑商户", tags = {TAG})
+  @PostMapping(value = "/private/studioMerchant/unbind")
+  @Override
+  public JsonResult<Void> unbind(@RequestBody @Valid UnbindStudioMerchantRequest request) {
+    studioMerchantService.unbind(request.getStudioId(), request.getMerchantId());
+    return JsonResult.success();
+  }
+
   @ApiOperation(value = "查询场馆进件申请记录", tags = {TAG})
   @PostMapping(value = "/private/studioMerchant/getApply")
   @Override