feat:list merchant

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

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

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

@@ -62,7 +62,7 @@ import java.util.stream.Collectors;
 public class MerchantConvert {
 public class MerchantConvert {
 
 
   public static ApplyMerchantRequest convertRequest(String channelNo, String applyNo,
   public static ApplyMerchantRequest convertRequest(String channelNo, String applyNo,
-      ApplyStudioMerchantParams params, Map<ResourceTypeEnums, ResourceInfo> resourceMap,
+      ApplyStudioMerchantParams params, StudioVO studio, Map<ResourceTypeEnums, ResourceInfo> resourceMap,
       SubChannelInfoDTO subChannelInfo) {
       SubChannelInfoDTO subChannelInfo) {
     return ApplyMerchantRequest.builder()
     return ApplyMerchantRequest.builder()
         .bizCode(PartyTypeEnums.STUDIO.getCode())
         .bizCode(PartyTypeEnums.STUDIO.getCode())
@@ -70,7 +70,7 @@ public class MerchantConvert {
         .channelNo(channelNo)
         .channelNo(channelNo)
         .companyType(params.getCompanyType())
         .companyType(params.getCompanyType())
         .merchantName(params.getMerchantName())
         .merchantName(params.getMerchantName())
-        .shortName(params.getShortName())
+        .shortName(studio.getName())
         .legal(convertLegal(params))
         .legal(convertLegal(params))
         .bankCard(convertBankCard(params))
         .bankCard(convertBankCard(params))
         .license(convertLicense(params))
         .license(convertLicense(params))
@@ -184,7 +184,7 @@ public class MerchantConvert {
         .applyType(exist == null ? ApplyTypeEnums.OPEN : ApplyTypeEnums.RE_OPEN)
         .applyType(exist == null ? ApplyTypeEnums.OPEN : ApplyTypeEnums.RE_OPEN)
         .channelNo(channel)
         .channelNo(channel)
         .merchantName(encrypt.getMerchantName())
         .merchantName(encrypt.getMerchantName())
-        .shortName(encrypt.getShortName())
+        .shortName(studio.getName())
         .companyType(encrypt.getCompanyType())
         .companyType(encrypt.getCompanyType())
         .openState(OpenStateEnums.INIT)
         .openState(OpenStateEnums.INIT)
         .merchantInfo(convertMerchantInfo(encrypt))
         .merchantInfo(convertMerchantInfo(encrypt))

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

@@ -105,7 +105,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
 
 
       Map<ResourceTypeEnums, ResourceInfo> resourceMap = this.upload(params);
       Map<ResourceTypeEnums, ResourceInfo> resourceMap = this.upload(params);
       ApplyMerchantRequest request = MerchantConvert.convertRequest(channel, apply.getApplyNo(), params,
       ApplyMerchantRequest request = MerchantConvert.convertRequest(channel, apply.getApplyNo(), params,
-          resourceMap, configService.getDefaultBrandSubChannelInfo());
+          studio, resourceMap, configService.getDefaultBrandSubChannelInfo());
       merchantRpcService.apply(request);
       merchantRpcService.apply(request);
 
 
     } catch (Exception e) {
     } catch (Exception e) {

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

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