feat:merchantid

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

@@ -145,6 +145,9 @@ public class BrandMerchantServiceImpl implements BrandMerchantService {
   @Override
   public BrandMerchantVO getMerchant(Long brandId) {
     BrandToMerchant relation = brandToMerchantRpService.getByBrandId(brandId);
+    if (null == relation) {
+      return null;
+    }
     MerchantVO merchant = merchantRpcService.getByMerchantId(relation.getMerchantId());
     return MerchantConvert.convertBrandMerchant(relation, merchant,
         getDefaultBrandSubChannelInfo().getSubChannels());