feat:studioName

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

@@ -27,6 +27,9 @@ public class PageStudioMerchantApplyRequest {
   @ApiModelProperty(value = "商户简称")
   private String shortName;
 
+  @ApiModelProperty(value = "场馆名称")
+  private String studioName;
+
   @ApiModelProperty(value = "操作类型列表")
   private List<ApplyTypeEnum> applyTypeList;
 

api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/StudioMerchantApplyVO.java

@@ -60,6 +60,9 @@ public class StudioMerchantApplyVO {
   @ApiModelProperty("商户简称")
   private String shortName;
 
+  @ApiModelProperty("场馆名称")
+  private String studioName;
+
   @EnumMapping(enumClass = CompanyTypeEnums.class)
   @ApiModelProperty("企业类型")
   private String companyType;

api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/StudioMerchantVO.java

@@ -49,6 +49,9 @@ public class StudioMerchantVO {
   @ApiModelProperty("商户简称")
   private String shortName;
 
+  @ApiModelProperty("场馆名称")
+  private String studioName;
+
   @EnumMapping(enumClass = CompanyTypeEnums.class)
   @ApiModelProperty("企业类型")
   private String companyType;

repository/src/main/java/com/jiejing/fitness/finance/repository/entity/StudioMerchantApply.java

@@ -97,6 +97,11 @@ public class StudioMerchantApply implements Serializable {
   private String shortName;
 
   /**
+   * 场馆名称
+   */
+  private String studioName;
+
+  /**
    * 企业类型
    *
    * @see CompanyTypeEnums
@@ -233,6 +238,8 @@ public class StudioMerchantApply implements Serializable {
 
   public static final String SHORT_NAME = "short_name";
 
+  public static final String STUDIO_NAME = "studio_name";
+
   public static final String COMPANY_TYPE = "company_type";
 
   public static final String OPEN_STATE = "open_state";

repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/StudioMerchantApplyMapper.xml

@@ -17,7 +17,7 @@
 
   <!-- 通用查询结果列 -->
   <sql id="Base_Column_List">
-    id, brand_id, studio_id, apply_no, apply_type, channel_no, merchant_id, merchant_no, merchant_name, short_name, company_type, open_state, open_fail_message, ali_open_state, ali_auth_state, ali_merchant_no, ali_open_fail_message, wx_offline_open_state, wx_offline_auth_state, wx_offline_merchant_no, wx_offline_open_fail_message, wx_online_open_state, wx_online_auth_state, wx_online_merchant_no, wx_online_open_fail_message, merchant_info, salt, finish_time, create_time, update_time
+    id, brand_id, studio_id, apply_no, apply_type, channel_no, merchant_id, merchant_no, merchant_name, short_name, studio_name, company_type, open_state, open_fail_message, ali_open_state, ali_auth_state, ali_merchant_no, ali_open_fail_message, wx_offline_open_state, wx_offline_auth_state, wx_offline_merchant_no, wx_offline_open_fail_message, wx_online_open_state, wx_online_auth_state, wx_online_merchant_no, wx_online_open_fail_message, merchant_info, salt, finish_time, create_time, update_time
   </sql>
 
   <select id="getLatestOneSuccessByMerchantId"

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

@@ -45,6 +45,11 @@ public class PageStudioMerchantApplyQuery {
   private String merchantName;
 
   /**
+   * 场馆名称
+   */
+  private String studioName;
+
+  /**
    * 申请状态
    */
   private OpenStateEnums openState;

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

@@ -57,6 +57,9 @@ public class StudioMerchantApplyRpService extends
     if (StringUtil.isNotBlank(params.getShortName())) {
       wrapper.like(StudioMerchantApply.SHORT_NAME, params.getShortName());
     }
+    if (StringUtil.isNotBlank(params.getStudioName())) {
+      wrapper.like(StudioMerchantApply.STUDIO_NAME, params.getStudioName());
+    }
     if (CollectionUtil.isNotEmpty(params.getApplyTypeList())) {
       wrapper.in(StudioMerchantApply.APPLY_TYPE, convertApplyTypeList(params.getApplyTypeList()));
     }

service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java

@@ -166,6 +166,7 @@ public class MerchantConvert {
         .applyNo(Long.toString(id))
         .brandId(studio.getBrandId())
         .studioId(encrypt.getStudioId())
+        .studioName(studio.getName())
         .applyType(exist == null ? ApplyTypeEnum.OPEN.getCode() : ApplyTypeEnum.RE_OPEN.getCode())
         .channelNo(channel)
         .merchantName(encrypt.getMerchantName())
@@ -416,6 +417,7 @@ public class MerchantConvert {
         .merchantId(merchant.getId())
         .merchantNo(merchant.getMerchantNo())
         .merchantName(merchant.getMerchantName())
+        .studioName(apply.getStudioName())
         .shortName(merchant.getShortName())
         .openState(apply.getOpenState())
         .companyType(merchant.getCompanyType())
@@ -449,6 +451,7 @@ public class MerchantConvert {
         .id(apply.getId())
         .brandId(apply.getBrandId())
         .studioId(apply.getStudioId())
+        .studioName(apply.getStudioName())
         .applyNo(apply.getApplyNo())
         .applyType(apply.getApplyType())
         .channelNo(apply.getChannelNo())
@@ -567,12 +570,13 @@ public class MerchantConvert {
     }).sorted((o1, o2) -> o2.getFinishTime().compareTo(o1.getFinishTime())).collect(Collectors.toList());
   }
 
-  public static StudioMerchantApply convertBindApply(Long studioId, StudioMerchantApply apply) {
+  public static StudioMerchantApply convertBindApply(StudioVO studio, StudioMerchantApply apply) {
     StudioMerchantApply toSave = BeanUtil.map(apply, StudioMerchantApply.class);
     toSave.setId(IdWorker.getId());
     toSave.setApplyNo("-1");
     toSave.setApplyType(ApplyTypeEnum.BIND.getCode());
-    toSave.setStudioId(studioId);
+    toSave.setStudioId(studio.getId());
+    toSave.setStudioName(studio.getName());
     toSave.setCreateTime(new Date());
     toSave.setUpdateTime(new Date());
     return toSave;

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

@@ -141,7 +141,8 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
     }
     // 新增绑定记录
     if (flag) {
-      StudioMerchantApply bindApply = MerchantConvert.convertBindApply(studioId, apply);
+      StudioVO studio = studioRpcService.getStudio(studioId);
+      StudioMerchantApply bindApply = MerchantConvert.convertBindApply(studio, apply);
       studioMerchantApplyRpService.insert(bindApply);
     }
   }

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

@@ -39,6 +39,9 @@ public class PageStudioMerchantApplyParams {
   @ApiModelProperty(value = "商户名称")
   private String merchantName;
 
+  @ApiModelProperty(value = "场馆名称")
+  private String studioName;
+
   @ApiModelProperty(value = "申请状态")
   private OpenStateEnums openState;