feat:apply merchant

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

@@ -46,6 +46,11 @@ public class ApplyStudioMerchantRequest {
   @Size(max = 32, message = "最多32个字")
   private String merchantName;
 
+  @ApiModelProperty(value = "商户简称", required = true)
+  @NotBlank(message = "商户简称不能为空")
+  @Size(max = 20, message = "最多20个字")
+  private String shortName;
+
   @ApiModelProperty(value = "营业执照", required = true)
   @NotNull(message = "营业执照不能为空")
   @Valid

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

@@ -169,7 +169,7 @@ public class MerchantConvert {
         .applyType(exist == null ? ApplyTypeEnum.OPEN.getCode() : ApplyTypeEnum.RE_OPEN.getCode())
         .channelNo(channel)
         .merchantName(encrypt.getMerchantName())
-        .shortName(studio.getName())
+        .shortName(encrypt.getShortName())
         .companyType(encrypt.getCompanyType().getCode())
         .openState(OpenStateEnums.INIT.getCode())
         .merchantInfo(convertMerchantInfo(encrypt))

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

@@ -48,6 +48,11 @@ public class ApplyStudioMerchantParams {
   @Size(max = 32, message = "最多32个字")
   private String merchantName;
 
+  @ApiModelProperty(value = "商户简称", required = true)
+  @NotBlank(message = "商户简称不能为空")
+  @Size(max = 20, message = "最多20个字")
+  private String shortName;
+
   @ApiModelProperty(value = "营业执照", required = true)
   @NotNull(message = "营业执照不能为空")
   @Valid