feat:bind when open merchant success

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

@@ -365,9 +365,8 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
 
 
   }
   }
 
 
-  private void unbindHistoryMerchant(StudioMerchantApply apply) {
-    List<StudioMerchantApply> histories = studioMerchantApplyRpService.listSuccessApplyByStudioId(
-        apply.getStudioId());
+  private void unbindHistoryMerchant(Long studioId) {
+    List<StudioMerchantApply> histories = studioMerchantApplyRpService.listSuccessApplyByStudioId(studioId);
     if (CollectionUtil.isEmpty(histories)) {
     if (CollectionUtil.isEmpty(histories)) {
       return;
       return;
     }
     }
@@ -385,7 +384,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
         .map(PartyToMerchant::getMerchantId).orElse(null);
         .map(PartyToMerchant::getMerchantId).orElse(null);
 
 
     // 1. 解绑该场馆进件的历史商户所关联的所有其他场馆和品牌
     // 1. 解绑该场馆进件的历史商户所关联的所有其他场馆和品牌
-    this.unbindHistoryMerchant(apply);
+    this.unbindHistoryMerchant(apply.getStudioId());
 
 
     // 2. 绑定场馆
     // 2. 绑定场馆
     this.bind(apply.getStudioId(), event.getMerchantId(), false);
     this.bind(apply.getStudioId(), event.getMerchantId(), false);