feat:apply

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

@@ -5,6 +5,7 @@ import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
@@ -25,8 +26,8 @@ public class PageStudioMerchantApplyRequest {
   @ApiModelProperty(value = "商户简称")
   @ApiModelProperty(value = "商户简称")
   private String shortName;
   private String shortName;
 
 
-  @ApiModelProperty(value = "操作类型")
-  private ApplyTypeEnum applyType;
+  @ApiModelProperty(value = "操作类型列表")
+  private List<ApplyTypeEnum> applyTypeList;
 
 
   @ApiModelProperty(value = "场馆ID")
   @ApiModelProperty(value = "场馆ID")
   private Long studioId;
   private Long studioId;

repository/src/main/java/com/jiejing/fitness/finance/repository/query/PageStudioMerchantApplyQuery.java

@@ -3,6 +3,7 @@ package com.jiejing.fitness.finance.repository.query;
 import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
 import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
+import java.util.List;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
@@ -23,6 +24,11 @@ public class PageStudioMerchantApplyQuery {
   private ApplyTypeEnum applyType;
   private ApplyTypeEnum applyType;
 
 
   /**
   /**
+   * 操作类型列表
+   */
+  private List<ApplyTypeEnum> applyTypeList;
+
+  /**
    * 场馆ID
    * 场馆ID
    */
    */
   private Long studioId;
   private Long studioId;

repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioMerchantApplyRpService.java

@@ -16,6 +16,7 @@ package com.jiejing.fitness.finance.repository.service;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
+import com.jiejing.common.utils.collection.CollectionUtil;
 import com.jiejing.common.utils.text.StringUtil;
 import com.jiejing.common.utils.text.StringUtil;
 import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply;
 import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply;
 import com.jiejing.fitness.finance.repository.mapper.StudioMerchantApplyMapper;
 import com.jiejing.fitness.finance.repository.mapper.StudioMerchantApplyMapper;
@@ -43,8 +44,8 @@ public class StudioMerchantApplyRpService extends
     if (StringUtil.isNotBlank(params.getShortName())) {
     if (StringUtil.isNotBlank(params.getShortName())) {
       wrapper.like(StudioMerchantApply.SHORT_NAME, params.getShortName());
       wrapper.like(StudioMerchantApply.SHORT_NAME, params.getShortName());
     }
     }
-    if (null != params.getApplyType()) {
-      wrapper.eq(StudioMerchantApply.APPLY_TYPE, params.getApplyType());
+    if (CollectionUtil.isNotEmpty(params.getApplyTypeList())) {
+      wrapper.in(StudioMerchantApply.APPLY_TYPE, params.getApplyTypeList());
     }
     }
     if (null != params.getStudioId()) {
     if (null != params.getStudioId()) {
       wrapper.eq(StudioMerchantApply.STUDIO_ID, params.getStudioId());
       wrapper.eq(StudioMerchantApply.STUDIO_ID, params.getStudioId());

service/src/main/java/com/jiejing/fitness/finance/service/merchant/params/PageStudioMerchantApplyParams.java

@@ -5,6 +5,7 @@ import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
@@ -25,8 +26,8 @@ public class PageStudioMerchantApplyParams {
   @ApiModelProperty(value = "商户简称")
   @ApiModelProperty(value = "商户简称")
   private String shortName;
   private String shortName;
 
 
-  @ApiModelProperty(value = "操作类型")
-  private ApplyTypeEnum applyType;
+  @ApiModelProperty(value = "操作类型列表")
+  private List<ApplyTypeEnum> applyTypeList;
 
 
   @ApiModelProperty(value = "场馆ID")
   @ApiModelProperty(value = "场馆ID")
   private Long studioId;
   private Long studioId;