StudioAxfApply add brandId

api/src/main/java/com/jiejing/fitness/finance/api/axf/request/StudioAxfApplyRequest.java

@@ -25,6 +25,10 @@ public class StudioAxfApplyRequest {
   @NotNull(message = "场馆ID不能为空")
   @NotNull(message = "场馆ID不能为空")
   private Long studioId;
   private Long studioId;
 
 
+  @ApiModelProperty(value = "品牌ID", required = true)
+  @NotNull(message = "品牌ID不能为空")
+  private Long brandId;
+
   @ApiModelProperty(value = "商户名称")
   @ApiModelProperty(value = "商户名称")
   private String merchantName;
   private String merchantName;
 
 

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

@@ -67,6 +67,11 @@ public class StudioAxfApply implements Serializable {
   private Long studioId;
   private Long studioId;
 
 
   /**
   /**
+   * 备注: 品牌ID 是否允许为null: NO
+   */
+  private Long brandId;
+
+  /**
    * 备注: 操作类型 默认值: OPEN 是否允许为null: YES
    * 备注: 操作类型 默认值: OPEN 是否允许为null: YES
    */
    */
   private String applyType;
   private String applyType;
@@ -233,6 +238,8 @@ public class StudioAxfApply implements Serializable {
 
 
   public static final String STUDIO_ID = "studio_id";
   public static final String STUDIO_ID = "studio_id";
 
 
+  public static final String BRAND_ID = "brand_id";
+
   public static final String APPLY_TYPE = "apply_type";
   public static final String APPLY_TYPE = "apply_type";
 
 
   public static final String STUDIO_NAME = "studio_name";
   public static final String STUDIO_NAME = "studio_name";

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

@@ -17,7 +17,7 @@
 
 
   <!-- 通用查询结果列 -->
   <!-- 通用查询结果列 -->
   <sql id="Base_Column_List">
   <sql id="Base_Column_List">
-    id, channel_no, merchant_no, merchant_id, studio_id, apply_type, studio_name, merchant_name, short_name, company_type, state, card_no, license_code, license_name, license_type, license_expire_type, license_start_time, license_end_time, legal_name, legal_cert_no, phone, business_province_code, business_province_name, business_city_code, business_city_name, business_district_code, business_district_name, business_address, license_resource_id, store_head_resource_id, fail_message, op_id, op_name, salt, create_time, update_time
+    id, channel_no, merchant_no, merchant_id, studio_id, brand_id, apply_type, studio_name, merchant_name, short_name, company_type, state, card_no, license_code, license_name, license_type, license_expire_type, license_start_time, license_end_time, legal_name, legal_cert_no, phone, business_province_code, business_province_name, business_city_code, business_city_name, business_district_code, business_district_name, business_address, license_resource_id, store_head_resource_id, fail_message, op_id, op_name, salt, create_time, update_time
   </sql>
   </sql>
   <select id="countDistinctStudioId" resultType="java.lang.Integer">
   <select id="countDistinctStudioId" resultType="java.lang.Integer">
     select count(distinct studio_id)
     select count(distinct studio_id)

service/src/main/java/com/jiejing/fitness/finance/service/axf/impl/AxfServiceImpl.java

@@ -954,11 +954,11 @@ public class AxfServiceImpl implements AxfService {
 
 
   private Map<ResourceTypeEnums, ResourceInfo> upload(StudioAxfApplyRequest request, StudioAxfApply apply) {
   private Map<ResourceTypeEnums, ResourceInfo> upload(StudioAxfApplyRequest request, StudioAxfApply apply) {
     return AxfConvert.toResourceMap(request, resourceIds -> {
     return AxfConvert.toResourceMap(request, resourceIds -> {
-      Map<Long, com.jiejing.filecenter.api.resource.vo.ResourceInfoVO> urlMap = resourceRpcService.getResourceMap(
-          request.getStudioId(), resourceIds);
+      Map<Long, ResourceInfoVO> urlMap = resourceRpcService.getResourceMap(
+          request.getBrandId(), resourceIds);
       Map<Long, String> thirdMap = new HashMap<>(2);
       Map<Long, String> thirdMap = new HashMap<>(2);
       urlMap.keySet().forEach(resourceId -> {
       urlMap.keySet().forEach(resourceId -> {
-        com.jiejing.filecenter.api.resource.vo.ResourceInfoVO info = urlMap.get(resourceId);
+        ResourceInfoVO info = urlMap.get(resourceId);
         JsonResult<UploadVO> result = merchantApi.upload(
         JsonResult<UploadVO> result = merchantApi.upload(
             UploadRequest.builder().channelNo(AxfConst.CHANNEL_NO).url(info.getUrl())
             UploadRequest.builder().channelNo(AxfConst.CHANNEL_NO).url(info.getUrl())
                 .resourceType(ResourceTypeEnums.LICENSE).suffix(info.getSuffix())
                 .resourceType(ResourceTypeEnums.LICENSE).suffix(info.getSuffix())
@@ -1030,7 +1030,7 @@ public class AxfServiceImpl implements AxfService {
 
 
   private StudioAxfApplyVO toVO(StudioAxfApply apply) {
   private StudioAxfApplyVO toVO(StudioAxfApply apply) {
     return AxfConvert.toVO(apply, vo -> {
     return AxfConvert.toVO(apply, vo -> {
-      Map<Long, ResourceInfoVO> map = resourceRpcService.getResourceMap(vo.getStudioId(),
+      Map<Long, ResourceInfoVO> map = resourceRpcService.getResourceMap(apply.getBrandId(),
           Lists.newArrayList(vo.getLicenseResourceId(), vo.getStoreHeadResourceId()));
           Lists.newArrayList(vo.getLicenseResourceId(), vo.getStoreHeadResourceId()));
       vo.setLicenseResourceUrl(map.get(vo.getLicenseResourceId()).getUrl());
       vo.setLicenseResourceUrl(map.get(vo.getLicenseResourceId()).getUrl());
       vo.setStoreHeadResourceUrl(map.get(vo.getStoreHeadResourceId()).getUrl());
       vo.setStoreHeadResourceUrl(map.get(vo.getStoreHeadResourceId()).getUrl());