feat:apply

api/src/main/java/com/jiejing/fitness/finance/api/merchant/StudioMerchantApi.java

@@ -37,7 +37,7 @@ public interface StudioMerchantApi {
 
 
   @ApiOperation(value = "场馆入驻商户", tags = {TAG})
   @ApiOperation(value = "场馆入驻商户", tags = {TAG})
   @PostMapping(value = "/private/studioMerchant/apply")
   @PostMapping(value = "/private/studioMerchant/apply")
-  JsonResult<Void> apply(ApplyStudioMerchantRequest request);
+  JsonResult<Long> apply(ApplyStudioMerchantRequest request);
 
 
   @ApiOperation(value = "场馆绑定商户", tags = {TAG})
   @ApiOperation(value = "场馆绑定商户", tags = {TAG})
   @PostMapping(value = "/private/studioMerchant/bind")
   @PostMapping(value = "/private/studioMerchant/bind")

api/src/main/java/com/jiejing/fitness/finance/api/merchant/StudioMerchantApiFallback.java

@@ -37,7 +37,7 @@ public class StudioMerchantApiFallback implements FallbackFactory<StudioMerchant
       }
       }
 
 
       @Override
       @Override
-      public JsonResult<Void> apply(ApplyStudioMerchantRequest request) {
+      public JsonResult<Long> apply(ApplyStudioMerchantRequest request) {
         return JsonResult.rpcError();
         return JsonResult.rpcError();
       }
       }
 
 

app/src/main/java/com/jiejing/fitness/finance/app/controller/merchant/StudioMerchantController.java

@@ -55,10 +55,9 @@ public class StudioMerchantController implements StudioMerchantApi {
   @ApiOperation(value = "场馆入驻商户", tags = {TAG})
   @ApiOperation(value = "场馆入驻商户", tags = {TAG})
   @PostMapping(value = "/private/studioMerchant/apply")
   @PostMapping(value = "/private/studioMerchant/apply")
   @Override
   @Override
-  public JsonResult<Void> apply(@RequestBody @Valid ApplyStudioMerchantRequest request) {
+  public JsonResult<Long> apply(@RequestBody @Valid ApplyStudioMerchantRequest request) {
     ApplyStudioMerchantParams params = BeanUtil.map(request, ApplyStudioMerchantParams.class);
     ApplyStudioMerchantParams params = BeanUtil.map(request, ApplyStudioMerchantParams.class);
-    studioMerchantService.apply(params);
-    return JsonResult.success();
+    return JsonResult.success(studioMerchantService.apply(params));
   }
   }
 
 
   @ApiOperation(value = "场馆绑定商户", tags = {TAG})
   @ApiOperation(value = "场馆绑定商户", tags = {TAG})

service/src/main/java/com/jiejing/fitness/finance/service/merchant/StudioMerchantService.java

@@ -23,7 +23,7 @@ public interface StudioMerchantService {
    *
    *
    * @param params 请求参数
    * @param params 请求参数
    */
    */
-  void apply(ApplyStudioMerchantParams params);
+  Long apply(ApplyStudioMerchantParams params);
 
 
   /**
   /**
    * 绑定
    * 绑定

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

@@ -92,7 +92,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
 
 
   @Async(value = "financeThreadPool")
   @Async(value = "financeThreadPool")
   @Override
   @Override
-  public void apply(ApplyStudioMerchantParams params) {
+  public Long apply(ApplyStudioMerchantParams params) {
 
 
     Long id = IdWorker.getId();
     Long id = IdWorker.getId();
     StudioVO studio = studioRpcService.getStudio(params.getStudioId());
     StudioVO studio = studioRpcService.getStudio(params.getStudioId());
@@ -112,11 +112,12 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
       log.error("apply brand merchant fail {}, brand id = {}, studio id = {}", id, studio.getBrandId(),
       log.error("apply brand merchant fail {}, brand id = {}, studio id = {}", id, studio.getBrandId(),
           params.getStudioId(), e);
           params.getStudioId(), e);
       this.doOpenMerchantFail(id, e.getMessage());
       this.doOpenMerchantFail(id, e.getMessage());
-      return;
+      return id;
     }
     }
 
 
     this.doOpenMerchantProcess(id);
     this.doOpenMerchantProcess(id);
 
 
+    return id;
   }
   }
 
 
   @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
   @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)