Skip to content

F
fit-finance
Commit 20945116 by 程裕兵
Options

feat:merchantid

parent a100cc1b
Showing with 3 additions and 0 deletions
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/BrandMerchantServiceImpl.java
...@@ -145,6 +145,9 @@ public class BrandMerchantServiceImpl implements BrandMerchantService { ...@@ -145,6 +145,9 @@ public class BrandMerchantServiceImpl implements BrandMerchantService {
@Override @Override
public BrandMerchantVO getMerchant(Long brandId) { public BrandMerchantVO getMerchant(Long brandId) {
BrandToMerchant relation = brandToMerchantRpService.getByBrandId(brandId); BrandToMerchant relation = brandToMerchantRpService.getByBrandId(brandId);
if (null == relation) {
return null;
}
MerchantVO merchant = merchantRpcService.getByMerchantId(relation.getMerchantId()); MerchantVO merchant = merchantRpcService.getByMerchantId(relation.getMerchantId());
return MerchantConvert.convertBrandMerchant(relation, merchant, return MerchantConvert.convertBrandMerchant(relation, merchant,
getDefaultBrandSubChannelInfo().getSubChannels()); getDefaultBrandSubChannelInfo().getSubChannels());
......
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