|
|
|
@@ -189,7 +189,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
} |
|
|
|
WxBusiness bussiness = null; |
|
|
|
if (null != merchant.getBusinessId()) { |
|
|
|
bussiness = wxBusinessMapper.selectById(merchant.getBusinessId()); |
|
|
|
bussiness = wxBusinessMapper.selectById(merchant.getFinalTenantId(),merchant.getBusinessId()); |
|
|
|
} |
|
|
|
List<WxShopVo> shopVoList = wxShopService.findMerchantShopVoList(merchant,merchant.getId()); |
|
|
|
return merchantToVo(merchant,bussiness,shopVoList); |
|
|
|
@@ -1842,7 +1842,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
} |
|
|
|
Integer businessId = (Integer)merchantMap.get("business_id"); |
|
|
|
if (null != businessId) { |
|
|
|
WxBusiness business = wxBusinessMapper.selectById(brandId); |
|
|
|
WxBusiness business = wxBusinessMapper.selectById(shop.getFinalTenantId(),businessId); |
|
|
|
if (null != business) { |
|
|
|
merchantMap.put("businessTitle", business.getTitle()); |
|
|
|
} |
|
|
|
|