feat:vo enum -> string

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

 package com.jiejing.fitness.finance.api.merchant.request;
 
-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.api.merchant.request.model.BrandBankCardInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandLegalInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandLicenseInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandResourceInfo;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

api/src/main/java/com/jiejing/fitness/finance/api/merchant/model/AddressInfo.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/model/AddressInfo.java

-package com.jiejing.fitness.finance.api.merchant.model;
+package com.jiejing.fitness.finance.api.merchant.request.model;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

api/src/main/java/com/jiejing/fitness/finance/api/merchant/model/BrandBankCardInfo.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/model/BrandBankCardInfo.java

-package com.jiejing.fitness.finance.api.merchant.model;
+package com.jiejing.fitness.finance.api.merchant.request.model;
 
 import com.jiejing.paycenter.common.enums.merchant.CardTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.CertTypeEnums;

api/src/main/java/com/jiejing/fitness/finance/api/merchant/model/BrandLegalInfo.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/model/BrandLegalInfo.java

-package com.jiejing.fitness.finance.api.merchant.model;
+package com.jiejing.fitness.finance.api.merchant.request.model;
 
 import com.jiejing.paycenter.common.enums.merchant.CertTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.ExpireTypeEnums;

api/src/main/java/com/jiejing/fitness/finance/api/merchant/model/BrandLicenseInfo.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/model/BrandLicenseInfo.java

-package com.jiejing.fitness.finance.api.merchant.model;
+package com.jiejing.fitness.finance.api.merchant.request.model;
 
 import com.jiejing.paycenter.common.enums.merchant.ExpireTypeEnums;
 import io.swagger.annotations.ApiModel;

api/src/main/java/com/jiejing/fitness/finance/api/merchant/model/BrandResourceInfo.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/model/BrandResourceInfo.java

-package com.jiejing.fitness.finance.api.merchant.model;
+package com.jiejing.fitness.finance.api.merchant.request.model;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

+package com.jiejing.fitness.finance.api.merchant.vo;
+
+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 13:57
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(description = "地址VO")
+public class AddressVO {
+
+  @ApiModelProperty(value = "省")
+  private String province;
+
+  @ApiModelProperty(value = "市")
+  private String city;
+
+  @ApiModelProperty(value = "区")
+  private String district;
+
+  @ApiModelProperty(value = "详细地址", notes = "XX省XX市XX区XX街道")
+  private String address;
+
+}

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

+package com.jiejing.fitness.finance.api.merchant.vo;
+
+import com.jiejing.paycenter.common.enums.merchant.CardTypeEnums;
+import com.jiejing.paycenter.common.enums.merchant.CertTypeEnums;
+import com.jiejing.paycenter.common.enums.merchant.ExpireTypeEnums;
+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/20 15:10
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(description = "银行卡信息VO")
+public class BrandBankCardVO {
+
+  /**
+   * @see CardTypeEnums
+   */
+  @ApiModelProperty(value = "银行卡类型")
+  private String cardType;
+
+  @ApiModelProperty(value = "银行卡号")
+  private String cardNo;
+
+  @ApiModelProperty(value = "银行卡账户名（对私卡：持卡人姓名；对公卡：开户许可证的名称）")
+  private String cardName;
+
+  @ApiModelProperty(value = "持卡人手机号（对私卡必填）")
+  private String phone;
+
+  @ApiModelProperty(value = "证件号（对私卡：持卡人身份证；对公卡：营业执照号）")
+  private String certNo;
+
+  /**
+   * @see CertTypeEnums
+   */
+  @ApiModelProperty(value = "证件类型")
+  private String certType;
+
+  @ApiModelProperty(value = "基本存款账户编号或开户许可证核准号", notes = "对公卡必填")
+  private String baseDepositNo;
+
+  /**
+   * @see ExpireTypeEnums
+   */
+  @ApiModelProperty(value = "证件有效期类型", notes = "对私卡必填")
+  private String certExpireType;
+
+  @ApiModelProperty(value = "持卡人证件有效期开始日期", notes = "对私卡必填")
+  private Date certStartDate;
+
+  @ApiModelProperty(value = "持卡人证件有效期截止日期")
+  private Date certEndDate;
+
+  @ApiModelProperty(value = "银行编码")
+  private String bankCode;
+
+  @ApiModelProperty(value = "银行名称")
+  private String bankName;
+
+  @ApiModelProperty(value = "支行名称")
+  private String branchName;
+
+  @ApiModelProperty(value = "支行联行号")
+  private String branchCode;
+
+  @ApiModelProperty(value = "开卡地址：省市区详细地址")
+  private AddressVO cardAddress;
+
+}

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

+package com.jiejing.fitness.finance.api.merchant.vo;
+
+import com.jiejing.paycenter.common.enums.merchant.CertTypeEnums;
+import com.jiejing.paycenter.common.enums.merchant.ExpireTypeEnums;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chengyubing
+ * @since 2024/2/22 14:02
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(description = "品牌商户：法人信息")
+public class BrandLegalVO {
+
+  /**
+   * @see CertTypeEnums
+   */
+  @ApiModelProperty(value = "法人证件类型")
+  private String legalCertType;
+
+  @ApiModelProperty(value = "法人姓名")
+  private String legalName;
+
+  @ApiModelProperty(value = "法人证件号")
+  private String legalCertNo;
+
+  /**
+   * @see ExpireTypeEnums
+   */
+  @ApiModelProperty(value = "法人证件有效期类型")
+  private String legalCertExpireType;
+
+  @ApiModelProperty(value = "法人证件有效期开始日期")
+  private Date legalCertStartDate;
+
+  @ApiModelProperty(value = "法人证件有效期截止日期")
+  private Date legalCertEndDate;
+
+  @ApiModelProperty(value = "法人手机号")
+  private String legalPhone;
+
+  @ApiModelProperty(value = "法人身份证地址")
+  private AddressVO legalAddress;
+
+  @ApiModelProperty(value = "法人邮箱")
+  private String legalEmail;
+
+}

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

+package com.jiejing.fitness.finance.api.merchant.vo;
+
+import com.jiejing.paycenter.common.enums.merchant.ExpireTypeEnums;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chengyubing
+ * @since 2024/2/22 13:57
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(description = "品牌商户：营业执照信息")
+public class BrandLicenseVO {
+
+  @ApiModelProperty(value = "营业执照编号")
+  private String licenseCode;
+
+  /**
+   * @see ExpireTypeEnums
+   */
+  @ApiModelProperty(value = "营业执照有效期类型")
+  private String licenseExpireType;
+
+  @ApiModelProperty(value = "营业执照有效期开始日期")
+  private Date licenseStartDate;
+
+  @ApiModelProperty(value = "营业执照有效期截止日期")
+  private Date licenseEndDate;
+
+  @ApiModelProperty(value = "经营范围")
+  private String businessScope;
+
+  @ApiModelProperty(value = "成立时间")
+  private Date foundDate;
+
+  @ApiModelProperty(value = "注册资本", notes = "国营企业、私营企业、外资企业、事业单位、其他、集体经济必填；政府机构、个体工商户可为空")
+  private String registeredCapital;
+
+  @ApiModelProperty(value = "注册地址")
+  private AddressVO licenseAddress;
+
+}

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.fitness.finance.api.merchant.request.model.BrandBankCardInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandLegalInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandLicenseInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandResourceInfo;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import io.swagger.annotations.ApiModel;

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

@@ -23,11 +23,17 @@ public class BrandMerchantAuthSubChannelVO {
   @ApiModelProperty(value = "申请单")
   private String applyNo;
 
+  /**
+   * @see OpenStateEnums
+   */
   @ApiModelProperty(value = "授权状态")
-  private OpenStateEnums state;
+  private String state;
 
+  /**
+   * AuthPhaseEnums
+   */
   @ApiModelProperty(value = "认证阶段")
-  private AuthPhaseEnums phase;
+  private String phase;
 
   @ApiModelProperty(value = "授权二维码")
   private String qrCode;

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

@@ -19,8 +19,11 @@ import lombok.NoArgsConstructor;
 @ApiModel(description = "品牌商户绑定小程序AppIdVO")
 public class BrandMerchantBindXcxAppIdVO {
 
+  /**
+   * @see OpenStateEnums
+   */
   @ApiModelProperty("绑定状态")
-  private OpenStateEnums state;
+  private String state;
 
   @ApiModelProperty("失败原因")
   private String failMessage;

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.fitness.finance.api.merchant.request.model.BrandBankCardInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandLegalInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandLicenseInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandResourceInfo;
+import com.jiejing.paycenter.api.merchant.vo.SubChannelConfigVO;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
-import com.jiejing.paycenter.common.model.SubChannelConfigInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
@@ -44,14 +44,23 @@ public class BrandMerchantVO {
   @ApiModelProperty("商户简称")
   private String shortName;
 
+  /**
+   * @see CompanyTypeEnums
+   */
   @ApiModelProperty("企业类型")
-  private CompanyTypeEnums companyType;
+  private String companyType;
 
+  /**
+   * @see OpenStateEnums
+   */
   @ApiModelProperty("支付宝开通状态：I-初始态；S-成功；F-失败 默认值: I")
-  private OpenStateEnums aliOpenState;
+  private String aliOpenState;
 
+  /**
+   * @see OpenStateEnums
+   */
   @ApiModelProperty("支付宝认证状态")
-  private OpenStateEnums aliAuthState;
+  private String aliAuthState;
 
   @ApiModelProperty("支付宝商户号")
   private String aliMerchantNo;
@@ -59,11 +68,17 @@ public class BrandMerchantVO {
   @ApiModelProperty("支付宝开通失败原因")
   private String aliOpenFailMessage;
 
+  /**
+   * @see OpenStateEnums
+   */
   @ApiModelProperty("微信线下通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
-  private OpenStateEnums wxOfflineOpenState;
+  private String wxOfflineOpenState;
 
+  /**
+   * @see OpenStateEnums
+   */
   @ApiModelProperty("微信线下通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
-  private OpenStateEnums wxOfflineAuthState;
+  private String wxOfflineAuthState;
 
   @ApiModelProperty("微信线下通道商户号")
   private String wxOfflineMerchantNo;
@@ -71,11 +86,17 @@ public class BrandMerchantVO {
   @ApiModelProperty("微信线下通道开通失败原因")
   private String wxOfflineOpenFailMessage;
 
+  /**
+   * @see OpenStateEnums
+   */
   @ApiModelProperty("微信线上通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
-  private OpenStateEnums wxOnlineOpenState;
+  private String wxOnlineOpenState;
 
+  /**
+   * @see OpenStateEnums
+   */
   @ApiModelProperty("微信线上通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
-  private OpenStateEnums wxOnlineAuthState;
+  private String wxOnlineAuthState;
 
   @ApiModelProperty("微信线上通道商户号")
   private String wxOnlineMerchantNo;
@@ -84,18 +105,18 @@ public class BrandMerchantVO {
   private String wxOnlineOpenFailMessage;
 
   @ApiModelProperty(value = "营业执照")
-  private BrandLicenseInfo license;
+  private BrandLicenseVO license;
 
   @ApiModelProperty(value = "法人信息")
-  private BrandLegalInfo legal;
+  private BrandLegalVO legal;
 
   @ApiModelProperty(value = "结算卡信息")
-  private BrandBankCardInfo bankCard;
+  private BrandBankCardVO bankCard;
 
   @ApiModelProperty(value = "进件所需资料")
-  private BrandResourceInfo resource;
+  private BrandResourceVO resource;
 
   @ApiModelProperty("子渠道配置记录")
-  private List<SubChannelConfigInfo> subChannelConfigs;
+  private List<SubChannelConfigVO> subChannelConfigs;
 
 }

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

+package com.jiejing.fitness.finance.api.merchant.vo;
+
+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/2/22 14:03
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "品牌商户：进件资料")
+public class BrandResourceVO {
+
+  @ApiModelProperty(value = "营业执照图片")
+  private Long licensePicId;
+
+  @ApiModelProperty(value = "线下经营门头照")
+  private Long storeHeaderPicId;
+
+  @ApiModelProperty(value = "线下经营内景照")
+  private Long storeInnerPicId;
+
+  @ApiModelProperty(value = "线下经营收银台")
+  private Long storeCashierDescPicId;
+
+  @ApiModelProperty(value = "法人证件人像面（正面）")
+  private Long legalCertFrontPicId;
+
+  @ApiModelProperty(value = "法人证件国徽面（反面）")
+  private Long legalCertBackPicId;
+
+  @ApiModelProperty(value = "银行卡正面")
+  private Long bankCardFrontPicId;
+
+  @ApiModelProperty(value = "银行卡反面")
+  private Long bankCardBackPicId;
+
+  @ApiModelProperty(value = "结算卡持卡人证件人像面（正面）")
+  private Long bankCardCertFrontPicId;
+
+  @ApiModelProperty(value = "结算卡持卡人证件国徽面(反面)")
+  private Long bankCardCertBackPicId;
+
+}

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

@@ -8,19 +8,22 @@ import com.jiejing.common.utils.crypt.AesUtil;
 import com.jiejing.filecenter.api.resource.vo.ResourceInfoVO;
 import com.jiejing.fitness.finance.api.enums.ApplyTypeEnums;
 import com.jiejing.fitness.finance.api.enums.MerchantTypeEnums;
-import com.jiejing.fitness.finance.api.merchant.model.AddressInfo;
-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.api.merchant.request.model.AddressInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandResourceInfo;
+import com.jiejing.fitness.finance.api.merchant.vo.BrandBankCardVO;
+import com.jiejing.fitness.finance.api.merchant.vo.BrandLegalVO;
+import com.jiejing.fitness.finance.api.merchant.vo.BrandLicenseVO;
 import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantApplyVO;
-import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantBindXcxAppIdVO;
 import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantVO;
+import com.jiejing.fitness.finance.api.merchant.vo.BrandResourceVO;
 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.fitness.finance.service.utils.JsonUtil;
 import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
 import com.jiejing.paycenter.api.merchant.request.UploadRequest;
+import com.jiejing.paycenter.api.merchant.vo.ContactVO;
+import com.jiejing.paycenter.api.merchant.vo.LegalVO;
 import com.jiejing.paycenter.api.merchant.vo.MerchantVO;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.BusinessTypeEnums;
@@ -246,41 +249,43 @@ public class MerchantConvert {
         .build();
   }
 
-  private static BrandLicenseInfo convertLicense(License license) {
-    return JSON.parseObject(JSON.toJSONString(license), BrandLicenseInfo.class);
-  }
-
-  private static BrandLegalInfo convertLegal(Legal legal, Contact contact) {
-    BrandLegalInfo legalInfo = JSON.parseObject(JSON.toJSONString(legal), BrandLegalInfo.class);
+  private static BrandLegalVO convertLegal(LegalVO legal, ContactVO contact) {
+    BrandLegalVO legalInfo = JsonUtil.convertObject(legal, BrandLegalVO.class);
     legalInfo.setLegalEmail(contact.getContactEmail());
     return legalInfo;
   }
 
-  private static BrandBankCardInfo convertBankCard(BankCard bankCard) {
-    return JSON.parseObject(JSON.toJSONString(bankCard), BrandBankCardInfo.class);
-  }
-
-  private static BrandResourceInfo convertResource(Map<ResourceTypeEnums, ResourceInfo> resourceMap) {
-    BrandResourceInfo resourceInfo = new BrandResourceInfo();
-    resourceInfo.setLicensePicId(resourceMap.getOrDefault(LICENSE, new ResourceInfo()).getResourceId());
+  private static BrandResourceVO convertResource(
+      Map<String, com.jiejing.paycenter.api.merchant.vo.ResourceInfoVO> resourceMap) {
+    BrandResourceVO resourceInfo = new BrandResourceVO();
+    resourceInfo.setLicensePicId(
+        Optional.ofNullable(resourceMap.get(LICENSE.name())).map(e -> e.getResourceId()).orElse(null));
     resourceInfo.setStoreHeaderPicId(
-        resourceMap.getOrDefault(STORE_HEADER_PIC, new ResourceInfo()).getResourceId());
+        Optional.ofNullable(resourceMap.get(STORE_HEADER_PIC.name())).map(e -> e.getResourceId())
+            .orElse(null));
     resourceInfo.setStoreInnerPicId(
-        resourceMap.getOrDefault(STORE_INNER_PIC, new ResourceInfo()).getResourceId());
+        Optional.ofNullable(resourceMap.get(STORE_INNER_PIC.name())).map(e -> e.getResourceId())
+            .orElse(null));
     resourceInfo.setStoreCashierDescPicId(
-        resourceMap.getOrDefault(STORE_CASHIER_DESK_PIC, new ResourceInfo()).getResourceId());
+        Optional.ofNullable(resourceMap.get(STORE_CASHIER_DESK_PIC.name())).map(e -> e.getResourceId())
+            .orElse(null));
     resourceInfo.setLegalCertFrontPicId(
-        resourceMap.getOrDefault(LEGAL_CERT_FRONT, new ResourceInfo()).getResourceId());
+        Optional.ofNullable(resourceMap.get(LEGAL_CERT_FRONT.name())).map(e -> e.getResourceId())
+            .orElse(null));
     resourceInfo.setLegalCertBackPicId(
-        resourceMap.getOrDefault(LEGAL_CERT_BACK, new ResourceInfo()).getResourceId());
+        Optional.ofNullable(resourceMap.get(LEGAL_CERT_BACK.name())).map(e -> e.getResourceId())
+            .orElse(null));
     resourceInfo.setBankCardFrontPicId(
-        resourceMap.getOrDefault(BANK_CARD_FRONT, new ResourceInfo()).getResourceId());
+        Optional.ofNullable(resourceMap.get(BANK_CARD_FRONT.name())).map(e -> e.getResourceId())
+            .orElse(null));
     resourceInfo.setBankCardBackPicId(
-        resourceMap.getOrDefault(BANK_CARD_BACK, new ResourceInfo()).getResourceId());
+        Optional.ofNullable(resourceMap.get(BANK_CARD_BACK.name())).map(e -> e.getResourceId()).orElse(null));
     resourceInfo.setBankCardCertFrontPicId(
-        resourceMap.getOrDefault(BANK_CARD_CERT_FRONT, new ResourceInfo()).getResourceId());
+        Optional.ofNullable(resourceMap.get(BANK_CARD_CERT_FRONT.name())).map(e -> e.getResourceId())
+            .orElse(null));
     resourceInfo.setBankCardCertBackPicId(
-        resourceMap.getOrDefault(BANK_CARD_CERT_BACK, new ResourceInfo()).getResourceId());
+        Optional.ofNullable(resourceMap.get(BANK_CARD_CERT_BACK.name())).map(e -> e.getResourceId())
+            .orElse(null));
     return resourceInfo;
   }
 
@@ -423,12 +428,16 @@ public class MerchantConvert {
 
   public static BrandMerchantVO convertBrandMerchant(BrandToMerchant relation, MerchantVO merchant,
       List<SubChannelInfo> defaultSubChannels) {
-    Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap = convertSubChannelMap(merchant.getSubChannels(),
-        defaultSubChannels);
+    Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap = convertSubChannelMap(
+        JsonUtil.convertList(merchant.getSubChannels(), SubChannelInfo.class), defaultSubChannels);
     SubChannelInfo ali = channelMap.get(SubChannelOpenTypeEnums.ALI_OFFLINE);
     SubChannelInfo wxGzhOffline = channelMap.get(SubChannelOpenTypeEnums.WX_GZH_OFFLINE);
     OpenStateEnums wxOfflineState = convertWxOfflineState(channelMap);
     String wxOfflineFailMessage = convertWxOfflineFailMessage(channelMap);
+    OpenStateEnums aliAuthState = convertAliAuthState(
+        JsonUtil.convertList(merchant.getSubChannelAuths(), SubChannelAuthInfo.class));
+    OpenStateEnums wxOfflineAuthState = convertWxOfflineAuthState(
+        JsonUtil.convertList(merchant.getSubChannelAuths(), SubChannelAuthInfo.class));
     return BrandMerchantVO.builder()
         .brandId(relation.getBrandId())
         .channelNo(merchant.getChannelNo())
@@ -437,17 +446,17 @@ public class MerchantConvert {
         .merchantName(merchant.getMerchantName())
         .shortName(merchant.getShortName())
         .companyType(merchant.getCompanyType())
-        .aliOpenState(ali.getState())
-        .aliAuthState(convertAliAuthState(merchant.getSubChannelAuths()))
+        .aliOpenState(Optional.ofNullable(ali.getState()).map(Enum::name).orElse(null))
+        .aliAuthState(Optional.ofNullable(aliAuthState).map(Enum::name).orElse(null))
         .aliMerchantNo(JSON.toJSONString(ali.getMerchantNos()))
         .aliOpenFailMessage(ali.getFailMessage())
-        .wxOfflineOpenState(wxOfflineState)
+        .wxOfflineOpenState(Optional.ofNullable(wxOfflineState).map(Enum::name).orElse(null))
         .wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getMerchantNos()))
-        .wxOfflineAuthState(convertWxOfflineAuthState(merchant.getSubChannelAuths()))
+        .wxOfflineAuthState(Optional.ofNullable(wxOfflineAuthState).map(Enum::name).orElse(null))
         .wxOfflineOpenFailMessage(wxOfflineFailMessage)
-        .license(convertLicense(merchant.getLicense()))
+        .license(JsonUtil.convertObject(merchant.getLicense(), BrandLicenseVO.class))
         .legal(convertLegal(merchant.getLegal(), merchant.getContact()))
-        .bankCard(convertBankCard(merchant.getBankCard()))
+        .bankCard(JsonUtil.convertObject(merchant.getBankCard(), BrandBankCardVO.class))
         .resource(convertResource(merchant.getResourceMap()))
         .subChannelConfigs(merchant.getSubChannelConfigs())
         .build();

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

 package com.jiejing.fitness.finance.service.merchant.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.jiejing.common.exception.BizException;
 import com.jiejing.common.model.PageVO;
@@ -31,6 +30,7 @@ import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
 import com.jiejing.paycenter.api.merchant.vo.AuthSubChannelVO;
 import com.jiejing.paycenter.api.merchant.vo.ConfigSubChannelVO;
 import com.jiejing.paycenter.api.merchant.vo.MerchantVO;
+import com.jiejing.paycenter.api.merchant.vo.SubChannelAuthVO;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.ResourceTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelAuthTypeEnums;
@@ -186,7 +186,7 @@ public class BrandMerchantServiceImpl implements BrandMerchantService {
   public List<BrandMerchantAuthSubChannelVO> listAuthSubChannel(Long brandId) {
     BrandToMerchant relation = brandToMerchantRpService.getByBrandId(brandId, channel);
     MerchantVO merchant = merchantRpcService.getByMerchantId(relation.getMerchantId());
-    List<SubChannelAuthInfo> auths = merchant.getSubChannelAuths();
+    List<SubChannelAuthVO> auths = merchant.getSubChannelAuths();
     return Optional.ofNullable(auths).orElse(new ArrayList<>(1)).stream()
         .map(e -> BeanUtil.map(e, BrandMerchantAuthSubChannelVO.class)).collect(Collectors.toList());
   }

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

@@ -2,10 +2,10 @@ package com.jiejing.fitness.finance.service.merchant.params;
 
 import com.alibaba.fastjson.JSON;
 import com.jiejing.common.utils.crypt.AesUtil;
-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.api.merchant.request.model.BrandBankCardInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandLegalInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandLicenseInfo;
+import com.jiejing.fitness.finance.api.merchant.request.model.BrandResourceInfo;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

service/src/main/java/com/jiejing/fitness/finance/service/utils/JsonUtil.java

+package com.jiejing.fitness.finance.service.utils;
+
+import com.alibaba.fastjson.JSON;
+import java.util.List;
+
+/**
+ * @author chengyubing
+ * @since 2024/3/2 15:18
+ */
+public class JsonUtil {
+
+  public static <T> T convertObject(Object source, Class<T> clazz) {
+    return JSON.parseObject(JSON.toJSONString(source), clazz);
+  }
+
+  public static <T> List<T> convertList(Object source, Class<T> clazz) {
+    return JSON.parseArray(JSON.toJSONString(source), clazz);
+  }
+
+}