feat:bankcard

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

@@ -39,12 +39,10 @@ public class BrandBankCardInfo {
   @ApiModelProperty(value = "持卡人手机号（对私卡必填）")
   @ApiModelProperty(value = "持卡人手机号（对私卡必填）")
   private String phone;
   private String phone;
 
 
-  @ApiModelProperty(value = "证件号（对私卡：持卡人身份证；对公卡：营业执照号）", required = true)
-  @NotBlank(message = "证件号不能为空")
+  @ApiModelProperty(value = "证件号（对私卡：持卡人身份证；）", notes = "对私卡必填")
   private String certNo;
   private String certNo;
 
 
-  @ApiModelProperty(value = "证件类型", required = true)
-  @NotNull(message = "证件类型不能为空")
+  @ApiModelProperty(value = "证件类型", notes = "对私卡必填")
   private CertTypeEnums certType;
   private CertTypeEnums certType;
 
 
   @ApiModelProperty(value = "基本存款账户编号或开户许可证核准号", notes = "对公卡必填")
   @ApiModelProperty(value = "基本存款账户编号或开户许可证核准号", notes = "对公卡必填")

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

@@ -78,7 +78,6 @@ public class ApplyStudioMerchantParams {
         ApplyStudioMerchantParams.class);
         ApplyStudioMerchantParams.class);
     if (null != copy.getBankCard()) {
     if (null != copy.getBankCard()) {
       copy.getBankCard().setCardNo(AesUtil.encrypt(salt, copy.getBankCard().getCardNo()));
       copy.getBankCard().setCardNo(AesUtil.encrypt(salt, copy.getBankCard().getCardNo()));
-      copy.getBankCard().setCertNo(AesUtil.encrypt(salt, copy.getBankCard().getCertNo()));
       copy.getBankCard().setBaseDepositNo(AesUtil.encrypt(salt, copy.getBankCard().getBaseDepositNo()));
       copy.getBankCard().setBaseDepositNo(AesUtil.encrypt(salt, copy.getBankCard().getBaseDepositNo()));
     }
     }
     if (null != copy.getLegal()) {
     if (null != copy.getLegal()) {
@@ -95,7 +94,6 @@ public class ApplyStudioMerchantParams {
         ApplyStudioMerchantParams.class);
         ApplyStudioMerchantParams.class);
     if (null != copy.getBankCard()) {
     if (null != copy.getBankCard()) {
       copy.getBankCard().setCardNo(AesUtil.decrypt(salt, copy.getBankCard().getCardNo()));
       copy.getBankCard().setCardNo(AesUtil.decrypt(salt, copy.getBankCard().getCardNo()));
-      copy.getBankCard().setCertNo(AesUtil.decrypt(salt, copy.getBankCard().getCertNo()));
       copy.getBankCard().setBaseDepositNo(AesUtil.decrypt(salt, copy.getBankCard().getBaseDepositNo()));
       copy.getBankCard().setBaseDepositNo(AesUtil.decrypt(salt, copy.getBankCard().getBaseDepositNo()));
     }
     }
     if (null != copy.getLegal()) {
     if (null != copy.getLegal()) {