Skip to content

F
fit-finance
Commit a13940a9 by 程裕兵
Options

feat:list merchant

parent e31fffb5
Showing with 9 additions and 5 deletions
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/BrandMerchantServiceImpl.java
...@@ -40,6 +40,9 @@ public class BrandMerchantServiceImpl implements BrandMerchantService { ...@@ -40,6 +40,9 @@ public class BrandMerchantServiceImpl implements BrandMerchantService {
@Resource @Resource
private MerchantRpcService merchantRpcService; private MerchantRpcService merchantRpcService;
@Resource
private ConfigService configService;
@Override @Override
public void bind(Long brandId, Long merchantId) { public void bind(Long brandId, Long merchantId) {
PartyToMerchant exist = partyToMerchantRpService.getOneByPartyAndMerchantId(channel, brandId, PartyToMerchant exist = partyToMerchantRpService.getOneByPartyAndMerchantId(channel, brandId,
...@@ -59,9 +62,6 @@ public class BrandMerchantServiceImpl implements BrandMerchantService { ...@@ -59,9 +62,6 @@ public class BrandMerchantServiceImpl implements BrandMerchantService {
partyToMerchantRpService.deleteByPartyAndMerchantId(brandId, PartyTypeEnums.BRAND, merchantId); partyToMerchantRpService.deleteByPartyAndMerchantId(brandId, PartyTypeEnums.BRAND, merchantId);
} }
@Resource
private ConfigService configService;
@Override @Override
public List<StudioMerchantVO> list(Long brandId) { public List<StudioMerchantVO> list(Long brandId) {
List<PartyToMerchant> relations = partyToMerchantRpService.listByParty(brandId, PartyTypeEnums.BRAND, 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; ...@@ -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.AuthSubChannelRequest;
import com.jiejing.paycenter.api.merchant.request.ConfigSubChannelRequest; import com.jiejing.paycenter.api.merchant.request.ConfigSubChannelRequest;
import com.jiejing.paycenter.api.merchant.request.GetMerchantByIdRequest; 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.request.UploadRequest;
import com.jiejing.paycenter.api.merchant.vo.ApplyMerchantResultVO; import com.jiejing.paycenter.api.merchant.vo.ApplyMerchantResultVO;
import com.jiejing.paycenter.api.merchant.vo.AuthSubChannelVO; import com.jiejing.paycenter.api.merchant.vo.AuthSubChannelVO;
...@@ -91,8 +92,11 @@ public class MerchantRpcService { ...@@ -91,8 +92,11 @@ public class MerchantRpcService {
} }
public List<MerchantVO> listByIds(List<Long> merchantIds) { public List<MerchantVO> listByIds(List<Long> merchantIds) {
// TODO ListMerchantByIdsRequest request = new ListMerchantByIdsRequest();
return null; request.setMerchantIds(merchantIds);
JsonResult<List<MerchantVO>> result = merchantQueryApi.listByIds(request);
result.assertSuccess();
return result.getResult();
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment