|
|
|
@@ -204,11 +204,17 @@ public class MallCooUserInfoServiceImpl implements MallCooUserInfoService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public TenantEntity getMallCooPushTenant(TenantEntity tenantEntity,WxCUserBasicInfo basicInfo,String fromId) { |
|
|
|
public TenantEntity getMallCooPushTenant(TenantEntity tenantEntity,WxCUserBasicInfo basicInfo,String verifyTenantId,String fromId) { |
|
|
|
TenantEntity mallCooPushTenant = new TenantEntity(); |
|
|
|
|
|
|
|
if(wxMallService.isgroupSupport(tenantEntity)){ |
|
|
|
if(StringUtils.isNotBlank(fromId)){ |
|
|
|
|
|
|
|
if(StringUtils.isNotBlank(verifyTenantId) && !verifyTenantId.equals(tenantEntity.getTenantId())){ |
|
|
|
mallCooPushTenant.setTenantId(verifyTenantId); |
|
|
|
mallCooPushTenant.setParentTenantId(tenantEntity.getTenantId()); |
|
|
|
} |
|
|
|
|
|
|
|
if(StringUtils.isBlank(mallCooPushTenant.getTenantId()) && StringUtils.isNotBlank(fromId)){ |
|
|
|
TtMerchantPoi poiQ = new TtMerchantPoi(); |
|
|
|
poiQ.setParentTenantId(tenantEntity.getTenantId()); |
|
|
|
poiQ.setPoiId(fromId); |
|
|
|
@@ -217,6 +223,7 @@ public class MallCooUserInfoServiceImpl implements MallCooUserInfoService { |
|
|
|
mallCooPushTenant.updateTenantInfo(poiList.get(0)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if(StringUtils.isBlank(mallCooPushTenant.getTenantId())){ |
|
|
|
String[] split = basicInfo.getTenantId().split(","); |
|
|
|
for (String tenantId: split) { |
|
|
|
|