feat:list merchant

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

@@ -40,6 +40,9 @@ public class BrandMerchantServiceImpl implements BrandMerchantService {
   @Resource
   private MerchantRpcService merchantRpcService;
 
+  @Resource
+  private ConfigService configService;
+
   @Override
   public void bind(Long brandId, Long merchantId) {
     PartyToMerchant exist = partyToMerchantRpService.getOneByPartyAndMerchantId(channel, brandId,
@@ -59,9 +62,6 @@ public class BrandMerchantServiceImpl implements BrandMerchantService {
     partyToMerchantRpService.deleteByPartyAndMerchantId(brandId, PartyTypeEnums.BRAND, merchantId);
   }
 
-  @Resource
-  private ConfigService configService;
-
   @Override
   public List<StudioMerchantVO> list(Long brandId) {
     List<PartyToMerchant> relations = partyToMerchantRpService.listByParty(brandId, PartyTypeEnums.BRAND,

service/src/main/java/com/jiejing/fitness/finance/service/rpc/MerchantRpcService.java

@@ -8,6 +8,7 @@ import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
 import com.jiejing.paycenter.api.merchant.request.AuthSubChannelRequest;
 import com.jiejing.paycenter.api.merchant.request.ConfigSubChannelRequest;
 import com.jiejing.paycenter.api.merchant.request.GetMerchantByIdRequest;
+import com.jiejing.paycenter.api.merchant.request.ListMerchantByIdsRequest;
 import com.jiejing.paycenter.api.merchant.request.UploadRequest;
 import com.jiejing.paycenter.api.merchant.vo.ApplyMerchantResultVO;
 import com.jiejing.paycenter.api.merchant.vo.AuthSubChannelVO;
@@ -91,8 +92,11 @@ public class MerchantRpcService {
   }
 
   public List<MerchantVO> listByIds(List<Long> merchantIds) {
-//  TODO
-    return null;
+    ListMerchantByIdsRequest request = new ListMerchantByIdsRequest();
+    request.setMerchantIds(merchantIds);
+    JsonResult<List<MerchantVO>> result = merchantQueryApi.listByIds(request);
+    result.assertSuccess();
+    return result.getResult();
   }
 
 }