feat:apply

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

+package com.jiejing.fitness.finance.api.merchant.vo;
+
+import com.jiejing.fitness.finance.api.enums.ApplyTypeEnums;
+import com.jiejing.fitness.finance.api.merchant.model.BrandBankCardInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandLegalInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandLicenseInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandResourceInfo;
+import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
+import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chengyubing
+ * @since 2024/2/22 16:22
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "品牌商户申请VO")
+public class BrandMerchantApplyVO {
+
+  @ApiModelProperty("ID")
+  private Long id;
+
+  @ApiModelProperty("品牌ID")
+  private Long brandId;
+
+  @ApiModelProperty("场馆ID")
+  private Long studioId;
+
+  @ApiModelProperty("申请单号")
+  private String applyNo;
+
+  @ApiModelProperty("申请类型：OPEN-进件；RE_OPEN-重进件；")
+  private ApplyTypeEnums applyType;
+
+  @ApiModelProperty("渠道号")
+  private String channelNo;
+
+  @ApiModelProperty("商户ID（pay center提供）")
+  private Long merchantId;
+
+  @ApiModelProperty("三方商户号")
+  private String merchantNo;
+
+  @ApiModelProperty("商户名称")
+  private String merchantName;
+
+  @ApiModelProperty("商户简称")
+  private String shortName;
+
+  @ApiModelProperty("企业类型")
+  private CompanyTypeEnums companyType;
+
+  @ApiModelProperty("开通状态：I-初始态；P-处理中；S-成功；F-失败 默认值: I")
+  private OpenStateEnums openState;
+
+  @ApiModelProperty("开通失败原因")
+  private String openFailMessage;
+
+  @ApiModelProperty("支付宝开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums aliOpenState;
+
+  @ApiModelProperty("支付宝认证状态")
+  private OpenStateEnums aliAuthState;
+
+  @ApiModelProperty("支付宝商户号")
+  private String aliMerchantNo;
+
+  @ApiModelProperty("支付宝开通失败原因")
+  private String aliOpenFailMessage;
+
+  @ApiModelProperty("微信线下通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOfflineOpenState;
+
+  @ApiModelProperty("微信线下通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOfflineAuthState;
+
+  @ApiModelProperty("微信线下通道商户号")
+  private String wxOfflineMerchantNo;
+
+  @ApiModelProperty("微信线下通道开通失败原因")
+  private String wxOfflineOpenFailMessage;
+
+  @ApiModelProperty("微信线上通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOnlineOpenState;
+
+  @ApiModelProperty("微信线上通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOnlineAuthState;
+
+  @ApiModelProperty("微信线上通道商户号")
+  private String wxOnlineMerchantNo;
+
+  @ApiModelProperty("微信线下通道开通失败原因")
+  private String wxOnlineOpenFailMessage;
+
+  @ApiModelProperty(value = "营业执照")
+  private BrandLicenseInfo license;
+
+  @ApiModelProperty(value = "法人信息")
+  private BrandLegalInfo legal;
+
+  @ApiModelProperty(value = "结算卡信息")
+  private BrandBankCardInfo bankCard;
+
+  @ApiModelProperty(value = "进件所需资料")
+  private BrandResourceInfo resource;
+
+  @ApiModelProperty("完成时间")
+  private Date finishTime;
+
+  @ApiModelProperty("创建时间")
+  private Date createTime;
+
+  @ApiModelProperty("更新时间")
+  private Date updateTime;
+
+}

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

+package com.jiejing.fitness.finance.api.merchant.vo;
+
+import com.jiejing.fitness.finance.api.merchant.model.BrandBankCardInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandLegalInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandLicenseInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandResourceInfo;
+import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
+import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chengyubing
+ * @since 2024/2/22 16:22
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "品牌当前绑定的商户信息VO")
+public class BrandMerchantVO {
+
+  @ApiModelProperty("品牌ID")
+  private Long brandId;
+
+  @ApiModelProperty("渠道号")
+  private String channelNo;
+
+  @ApiModelProperty("商户ID（pay center提供）")
+  private Long merchantId;
+
+  @ApiModelProperty("三方商户号")
+  private String merchantNo;
+
+  @ApiModelProperty("商户名称")
+  private String merchantName;
+
+  @ApiModelProperty("商户简称")
+  private String shortName;
+
+  @ApiModelProperty("企业类型")
+  private CompanyTypeEnums companyType;
+
+
+  @ApiModelProperty("开通状态：I-初始态；P-处理中；S-成功；F-失败 默认值: I")
+  private OpenStateEnums openState;
+
+  @ApiModelProperty("开通失败原因")
+  private String openFailMessage;
+
+  @ApiModelProperty("支付宝开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums aliOpenState;
+
+  @ApiModelProperty("支付宝认证状态")
+  private OpenStateEnums aliAuthState;
+
+  @ApiModelProperty("支付宝商户号")
+  private String aliMerchantNo;
+
+  @ApiModelProperty("支付宝开通失败原因")
+  private String aliOpenFailMessage;
+
+  @ApiModelProperty("微信线下通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOfflineOpenState;
+
+  @ApiModelProperty("微信线下通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOfflineAuthState;
+
+  @ApiModelProperty("微信线下通道商户号")
+  private String wxOfflineMerchantNo;
+
+  @ApiModelProperty("微信线下通道开通失败原因")
+  private String wxOfflineOpenFailMessage;
+
+  @ApiModelProperty("微信线上通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOnlineOpenState;
+
+  @ApiModelProperty("微信线上通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOnlineAuthState;
+
+  @ApiModelProperty("微信线上通道商户号")
+  private String wxOnlineMerchantNo;
+
+  @ApiModelProperty("微信线下通道开通失败原因")
+  private String wxOnlineOpenFailMessage;
+
+  @ApiModelProperty(value = "营业执照")
+  private BrandLicenseInfo license;
+
+  @ApiModelProperty(value = "法人信息")
+  private BrandLegalInfo legal;
+
+  @ApiModelProperty(value = "结算卡信息")
+  private BrandBankCardInfo bankCard;
+
+  @ApiModelProperty(value = "进件所需资料")
+  private BrandResourceInfo resource;
+
+}

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

@@ -32,7 +32,7 @@ import lombok.NoArgsConstructor;
  * 品牌商户申请表（M端以及B端数据回显用，支付以及各状态判断、商户号不使用此表）
  * </p>
  *
- * @author chengyubing, created on 2024-02-20
+ * @author chengyubing, created on 2024-02-22
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -41,7 +41,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class BrandMerchantApply implements Serializable {
 
-  private static final long serialVersionUID = 8208543338007620669L;
+  private static final long serialVersionUID = -4973389381018495600L;
 
   /**
    * ID

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

+/*
+ * Copyright © 2024 Hangzhou Jiejing Technology Co., Ltd. All rights reserved.
+ *
+ * The copyright of the company's program code belongs to Hangzhou Jiejing Technology Co., Ltd. No one can illegally copy it without the explicit permission of this website.
+ * Official website: www.xiaomai5.com
+ *
+ *
+ *
+ * Copyright © 2024 杭州杰竞科技有限公司 版权所有.
+ *
+ * 本公司程序代码的版权归杭州杰竞科技有限公司所有，未经本网站的明确许可，任何人不得非法复制。
+ * 官网: www.xiaomai5.com
+ */
+
+package com.jiejing.fitness.finance.repository.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 品牌商户关联表（1:1）
+ * </p>
+ *
+ * @author chengyubing, created on 2024-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class BrandToMerchant implements Serializable {
+
+  private static final long serialVersionUID = -4973389381018495600L;
+
+  /**
+   * 备注: ID 是否允许为null: NO
+   */
+  @TableId(value = "id", type = IdType.ID_WORKER)
+  private Long id;
+
+  /**
+   * 备注: 品牌ID 是否允许为null: YES
+   */
+  private Long brandId;
+
+  /**
+   * 备注: paycenter的商户ID 是否允许为null: YES
+   */
+  private Long merchantId;
+
+  /**
+   * 备注: 创建时间 是否允许为null: YES
+   */
+  private Date createTime;
+
+  /**
+   * 备注: 更新时间 是否允许为null: YES
+   */
+  private Date updateTime;
+
+
+  public static final String ID = "id";
+
+  public static final String BRAND_ID = "brand_id";
+
+  public static final String MERCHANT_ID = "merchant_id";
+
+  public static final String CREATE_TIME = "create_time";
+
+  public static final String UPDATE_TIME = "update_time";
+
+}

repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/BrandMerchantApplyMapper.java

@@ -23,7 +23,7 @@ import org.apache.ibatis.annotations.Param;
  * 品牌商户申请表（M端以及B端数据回显用，支付以及各状态判断、商户号不使用此表） Mapper 接口
  * </p>
  *
- * @author chengyubing, created on 2024-02-20
+ * @author chengyubing, created on 2024-02-22
  */
 public interface BrandMerchantApplyMapper extends XBaseMapper<BrandMerchantApply> {
 

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

@@ -21,7 +21,7 @@
   </sql>
 
   <select id="getLatestOneSuccessByBrandId"
-    resultType="com.jiejing.fitness.finance.repository.entity.BrandMerchantApply">
+          resultType="com.jiejing.fitness.finance.repository.entity.BrandMerchantApply">
     select *
     from brand_merchant_apply
     where brand_id = #{brandId}

repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/BrandMerchantMapper.java → repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/BrandToMerchantMapper.java

@@ -14,16 +14,16 @@
 
 package com.jiejing.fitness.finance.repository.mapper;
 
-import com.jiejing.fitness.finance.repository.entity.BrandMerchant;
+import com.jiejing.fitness.finance.repository.entity.BrandToMerchant;
 import com.jiejing.mbp.inject.XBaseMapper;
 
 /**
  * <p>
- * 品牌商户表（只保留最新在用的） Mapper 接口
+ * 品牌商户关联表（1:1） Mapper 接口
  * </p>
  *
  * @author chengyubing, created on 2024-02-22
  */
-public interface BrandMerchantMapper extends XBaseMapper<BrandMerchant> {
+public interface BrandToMerchantMapper extends XBaseMapper<BrandToMerchant> {
 
 }

repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/BrandMerchantMapper.xml → repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/BrandToMerchantMapper.xml

@@ -13,11 +13,11 @@
   ~ 官网: www.xiaomai5.com
   -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jiejing.fitness.finance.repository.mapper.BrandMerchantMapper">
+<mapper namespace="com.jiejing.fitness.finance.repository.mapper.BrandToMerchantMapper">
 
   <!-- 通用查询结果列 -->
   <sql id="Base_Column_List">
-    id, brand_id, channel_no, merchant_id, merchant_no, merchant_name, short_name, company_type, ali_auth_state, ali_merchant_no, wx_offline_auth_state, wx_offline_merchant_no, wx_online_auth_state, wx_online_merchant_no, business_province, business_city, business_district, business_address, license_code, license_expire_type, license_start_date, license_end_date, license_business_scope, license_found_date, license_registered_capital, license_province, license_city, license_district, license_address, legal_name, legal_cert_no, legal_cert_type, legal_cert_expire_type, legal_cert_start_date, legal_cert_end_date, legal_phone, legal_province, legal_city, legal_district, legal_address, contact_email, bank_card_type, bank_card_no, bank_card_name, bank_phone, bank_cert_no, bank_cert_type, bank_cert_expire_type, bank_cert_start_date, bank_cert_end_date, bank_base_deposit_no, bank_code, bank_name, bank_branch_name, bank_branch_code, bank_card_province, bank_card_city, bank_card_district, bank_card_address, resource_info, salt, finish_time, create_time, update_time
+    id, brand_id, merchant_id, create_time, update_time
   </sql>
 
 </mapper>

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

@@ -24,7 +24,7 @@ import org.springframework.stereotype.Service;
  * 品牌商户申请表（M端以及B端数据回显用，支付以及各状态判断、商户号不使用此表） 服务实现类
  * </p>
  *
- * @author chengyubing, created on 2024-02-20
+ * @author chengyubing, created on 2024-02-22
  */
 @Service
 public class BrandMerchantApplyRpService extends

repository/src/main/java/com/jiejing/fitness/finance/repository/service/BrandMerchantRpService.java → repository/src/main/java/com/jiejing/fitness/finance/repository/service/BrandToMerchantRpService.java

@@ -15,24 +15,25 @@
 package com.jiejing.fitness.finance.repository.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiejing.fitness.finance.repository.entity.BrandMerchant;
-import com.jiejing.fitness.finance.repository.mapper.BrandMerchantMapper;
+import com.jiejing.fitness.finance.repository.entity.BrandToMerchant;
+import com.jiejing.fitness.finance.repository.mapper.BrandToMerchantMapper;
 import com.jiejing.mbp.MapperRepoService;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 品牌商户表（只保留最新在用的） 服务实现类
+ * 品牌商户关联表（1:1） 服务实现类
  * </p>
  *
  * @author chengyubing, created on 2024-02-22
  */
 @Service
-public class BrandMerchantRpService extends MapperRepoService<Long, BrandMerchant, BrandMerchantMapper> {
+public class BrandToMerchantRpService extends
+    MapperRepoService<Long, BrandToMerchant, BrandToMerchantMapper> {
 
-  public BrandMerchant getByBrandId(Long brandId) {
-    QueryWrapper<BrandMerchant> wrapper = new QueryWrapper<>();
-    wrapper.eq(BrandMerchant.BRAND_ID, brandId);
+  public BrandToMerchant getByBrandId(Long brandId) {
+    QueryWrapper<BrandToMerchant> wrapper = new QueryWrapper<>();
+    wrapper.eq(BrandToMerchant.BRAND_ID, brandId);
     return this.baseMapper.selectOne(wrapper);
   }
 

repository/src/test/java/com/jiejing/fitness/finance/repository/GeneratorServiceEntity.java

@@ -51,8 +51,8 @@ public class GeneratorServiceEntity {
    */
   private String author = "chengyubing";
   private String[] tableNames = {
-//      "brand_merchant_apply",
-      "brand_merchant"
+      "brand_merchant_apply",
+      "brand_to_merchant"
   };
 
   /**

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

@@ -15,8 +15,8 @@ import com.jiejing.fitness.finance.api.merchant.model.BrandBankCardInfo;
 import com.jiejing.fitness.finance.api.merchant.model.BrandLegalInfo;
 import com.jiejing.fitness.finance.api.merchant.model.BrandLicenseInfo;
 import com.jiejing.fitness.finance.api.merchant.model.BrandResourceInfo;
-import com.jiejing.fitness.finance.repository.entity.BrandMerchant;
 import com.jiejing.fitness.finance.repository.entity.BrandMerchantApply;
+import com.jiejing.fitness.finance.repository.entity.BrandToMerchant;
 import com.jiejing.fitness.finance.service.merchant.params.ApplyBrandMerchantParams;
 import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
 import com.jiejing.paycenter.api.merchant.request.OpenSingleSubChannelRequest;
@@ -250,24 +250,11 @@ public class MerchantConvert {
         .wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getSubMerchantNos()))
         .wxOfflineAuthState(convertWxOfflineAuthState(event.getSubChannelAuths()))
         .wxOfflineOpenFailMessage(wxOfflineFailMessage)
-        .merchantInfo(convertMerchantInfo(apply, event))
         .finishTime(OpenStateEnums.SUCCESS == state ? new Date() : null)
         .updateTime(new Date())
         .build();
   }
 
-  private static String convertMerchantInfo(BrandMerchantApply apply, MerchantEvent event) {
-    ApplyBrandMerchantParams original = JSON.parseObject(apply.getMerchantNo(),
-        ApplyBrandMerchantParams.class);
-    ApplyBrandMerchantParams info = ApplyBrandMerchantParams.builder()
-        .resource(original.getResource())
-        .bankCard(convertBankCard(event))
-        .legal(convertLegal(event))
-        .license(convertLicense(event))
-        .build();
-    return JSON.toJSONString(info);
-  }
-
   private static BrandLicenseInfo convertLicense(MerchantEvent event) {
     return JSON.parseObject(JSON.toJSONString(event.getLicense()), BrandLicenseInfo.class);
   }
@@ -369,9 +356,9 @@ public class MerchantConvert {
         .collect(Collectors.toList());
   }
 
-  public static BrandMerchant convertMerchant(BrandMerchantApply apply) {
-    BrandMerchant merchant = BeanUtil.map(apply, BrandMerchant.class);
-    merchant.setId(apply.getMerchantId());
+  public static BrandToMerchant convertMerchant(BrandMerchantApply apply) {
+    BrandToMerchant merchant = BeanUtil.map(apply, BrandToMerchant.class);
+    merchant.setId(apply.getBrandId());
     merchant.setCreateTime(new Date());
     merchant.setUpdateTime(new Date());
     return merchant;

service/src/main/java/com/jiejing/fitness/finance/service/merchant/dto/BrandMerchantApplyDTO.java

+package com.jiejing.fitness.finance.service.merchant.dto;
+
+import com.jiejing.fitness.finance.api.enums.ApplyTypeEnums;
+import com.jiejing.fitness.finance.api.merchant.model.BrandBankCardInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandLegalInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandLicenseInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandResourceInfo;
+import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
+import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chengyubing
+ * @since 2024/2/22 16:22
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "品牌商户申请DTO")
+public class BrandMerchantApplyDTO {
+
+  @ApiModelProperty("ID")
+  private Long id;
+
+  @ApiModelProperty("品牌ID")
+  private Long brandId;
+
+  @ApiModelProperty("场馆ID")
+  private Long studioId;
+
+  @ApiModelProperty("申请单号")
+  private String applyNo;
+
+  @ApiModelProperty("申请类型：OPEN-进件；RE_OPEN-重进件；")
+  private ApplyTypeEnums applyType;
+
+  @ApiModelProperty("渠道号")
+  private String channelNo;
+
+  @ApiModelProperty("商户ID（pay center提供）")
+  private Long merchantId;
+
+  @ApiModelProperty("三方商户号")
+  private String merchantNo;
+
+  @ApiModelProperty("商户名称")
+  private String merchantName;
+
+  @ApiModelProperty("商户简称")
+  private String shortName;
+
+  @ApiModelProperty("企业类型")
+  private CompanyTypeEnums companyType;
+
+  @ApiModelProperty("开通状态：I-初始态；P-处理中；S-成功；F-失败 默认值: I")
+  private OpenStateEnums openState;
+
+  @ApiModelProperty("开通失败原因")
+  private String openFailMessage;
+
+  @ApiModelProperty("支付宝开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums aliOpenState;
+
+  @ApiModelProperty("支付宝认证状态")
+  private OpenStateEnums aliAuthState;
+
+  @ApiModelProperty("支付宝商户号")
+  private String aliMerchantNo;
+
+  @ApiModelProperty("支付宝开通失败原因")
+  private String aliOpenFailMessage;
+
+  @ApiModelProperty("微信线下通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOfflineOpenState;
+
+  @ApiModelProperty("微信线下通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOfflineAuthState;
+
+  @ApiModelProperty("微信线下通道商户号")
+  private String wxOfflineMerchantNo;
+
+  @ApiModelProperty("微信线下通道开通失败原因")
+  private String wxOfflineOpenFailMessage;
+
+  @ApiModelProperty("微信线上通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOnlineOpenState;
+
+  @ApiModelProperty("微信线上通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOnlineAuthState;
+
+  @ApiModelProperty("微信线上通道商户号")
+  private String wxOnlineMerchantNo;
+
+  @ApiModelProperty("微信线下通道开通失败原因")
+  private String wxOnlineOpenFailMessage;
+
+  @ApiModelProperty(value = "营业执照")
+  private BrandLicenseInfo license;
+
+  @ApiModelProperty(value = "法人信息")
+  private BrandLegalInfo legal;
+
+  @ApiModelProperty(value = "结算卡信息")
+  private BrandBankCardInfo bankCard;
+
+  @ApiModelProperty(value = "进件所需资料")
+  private BrandResourceInfo resource;
+
+  @ApiModelProperty("完成时间")
+  private Date finishTime;
+
+  @ApiModelProperty("创建时间")
+  private Date createTime;
+
+  @ApiModelProperty("更新时间")
+  private Date updateTime;
+
+}

service/src/main/java/com/jiejing/fitness/finance/service/merchant/dto/BrandMerchantDTO.java

+package com.jiejing.fitness.finance.service.merchant.dto;
+
+import com.jiejing.fitness.finance.api.merchant.model.BrandBankCardInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandLegalInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandLicenseInfo;
+import com.jiejing.fitness.finance.api.merchant.model.BrandResourceInfo;
+import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
+import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chengyubing
+ * @since 2024/2/22 16:22
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "品牌当前绑定的商户信息DTO")
+public class BrandMerchantDTO {
+
+  @ApiModelProperty("品牌ID")
+  private Long brandId;
+
+  @ApiModelProperty("渠道号")
+  private String channelNo;
+
+  @ApiModelProperty("商户ID（pay center提供）")
+  private Long merchantId;
+
+  @ApiModelProperty("三方商户号")
+  private String merchantNo;
+
+  @ApiModelProperty("商户名称")
+  private String merchantName;
+
+  @ApiModelProperty("商户简称")
+  private String shortName;
+
+  @ApiModelProperty("企业类型")
+  private CompanyTypeEnums companyType;
+
+
+  @ApiModelProperty("开通状态：I-初始态；P-处理中；S-成功；F-失败 默认值: I")
+  private OpenStateEnums openState;
+
+  @ApiModelProperty("开通失败原因")
+  private String openFailMessage;
+
+  @ApiModelProperty("支付宝开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums aliOpenState;
+
+  @ApiModelProperty("支付宝认证状态")
+  private OpenStateEnums aliAuthState;
+
+  @ApiModelProperty("支付宝商户号")
+  private String aliMerchantNo;
+
+  @ApiModelProperty("支付宝开通失败原因")
+  private String aliOpenFailMessage;
+
+  @ApiModelProperty("微信线下通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOfflineOpenState;
+
+  @ApiModelProperty("微信线下通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOfflineAuthState;
+
+  @ApiModelProperty("微信线下通道商户号")
+  private String wxOfflineMerchantNo;
+
+  @ApiModelProperty("微信线下通道开通失败原因")
+  private String wxOfflineOpenFailMessage;
+
+  @ApiModelProperty("微信线上通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOnlineOpenState;
+
+  @ApiModelProperty("微信线上通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
+  private OpenStateEnums wxOnlineAuthState;
+
+  @ApiModelProperty("微信线上通道商户号")
+  private String wxOnlineMerchantNo;
+
+  @ApiModelProperty("微信线下通道开通失败原因")
+  private String wxOnlineOpenFailMessage;
+
+  @ApiModelProperty(value = "营业执照")
+  private BrandLicenseInfo license;
+
+  @ApiModelProperty(value = "法人信息")
+  private BrandLegalInfo legal;
+
+  @ApiModelProperty(value = "结算卡信息")
+  private BrandBankCardInfo bankCard;
+
+  @ApiModelProperty(value = "进件所需资料")
+  private BrandResourceInfo resource;
+
+}

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

@@ -3,10 +3,10 @@ package com.jiejing.fitness.finance.service.merchant.impl;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.jiejing.common.exception.BizException;
 import com.jiejing.filecenter.api.resource.vo.ResourceInfoVO;
-import com.jiejing.fitness.finance.repository.entity.BrandMerchant;
 import com.jiejing.fitness.finance.repository.entity.BrandMerchantApply;
+import com.jiejing.fitness.finance.repository.entity.BrandToMerchant;
 import com.jiejing.fitness.finance.repository.service.BrandMerchantApplyRpService;
-import com.jiejing.fitness.finance.repository.service.BrandMerchantRpService;
+import com.jiejing.fitness.finance.repository.service.BrandToMerchantRpService;
 import com.jiejing.fitness.finance.service.enums.FinanceErrorEnums;
 import com.jiejing.fitness.finance.service.merchant.BrandMerchantService;
 import com.jiejing.fitness.finance.service.merchant.convert.MerchantConvert;
@@ -58,7 +58,7 @@ public class BrandMerchantServiceImpl implements BrandMerchantService {
   private BrandMerchantApplyRpService brandMerchantApplyRpService;
 
   @Resource
-  private BrandMerchantRpService brandMerchantRpService;
+  private BrandToMerchantRpService brandToMerchantRpService;
 
 
   @Async(value = "financeThreadPool")
@@ -116,11 +116,11 @@ public class BrandMerchantServiceImpl implements BrandMerchantService {
     BrandMerchantApply applyToModify = MerchantConvert.convertApply(apply, event);
     if (OpenStateEnums.SUCCESS == applyToModify.getOpenState()) {
       // 所有子通道全部开通成功
-      BrandMerchant exist = brandMerchantRpService.getByBrandId(apply.getBrandId());
+      BrandToMerchant exist = brandToMerchantRpService.getByBrandId(apply.getBrandId());
       if (null == exist) {
-        brandMerchantRpService.insert(MerchantConvert.convertMerchant(apply));
+        brandToMerchantRpService.insert(MerchantConvert.convertMerchant(apply));
       } else {
-        brandMerchantRpService.updateById(MerchantConvert.convertMerchant(apply));
+        brandToMerchantRpService.updateById(MerchantConvert.convertMerchant(apply));
       }
     }
     brandMerchantApplyRpService.updateById(applyToModify);