|
|
|
@@ -52,16 +52,19 @@ public class WxBusinessServiceImpl implements WxBusinessService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WxBusiness> findListAll(TenantEntity tenantEntity, Integer filter,Integer paltCode) { |
|
|
|
if (filter == null){ |
|
|
|
return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); |
|
|
|
WxBusiness bq = new WxBusiness(); |
|
|
|
bq.setFinalTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
bq.setIsRoot(EnumYesOrNo.YES.getCode()); |
|
|
|
if (filter == null){ |
|
|
|
return wxBusinessMapper.findListAll(bq); |
|
|
|
}else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) { |
|
|
|
if (paltCode == null) |
|
|
|
paltCode = EnumAppPlat.WX.getCode(); |
|
|
|
return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); |
|
|
|
return wxBusinessMapper.findListForCoupon(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); |
|
|
|
}else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) { |
|
|
|
return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); |
|
|
|
return wxBusinessMapper.findListForMerchant(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); |
|
|
|
}else { |
|
|
|
return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); |
|
|
|
return wxBusinessMapper.findListAll(bq); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@@ -210,7 +213,9 @@ public class WxBusinessServiceImpl implements WxBusinessService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<Integer, WxBusiness> findAllMap(TenantEntity tenantEntity) { |
|
|
|
List<WxBusiness> list = wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); |
|
|
|
WxBusiness bq = new WxBusiness(); |
|
|
|
bq.setFinalTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
List<WxBusiness> list = wxBusinessMapper.findListAll(bq); |
|
|
|
Map<Integer,WxBusiness> map = new HashMap<Integer,WxBusiness>(); |
|
|
|
if (null != list) { |
|
|
|
for (int i = 0 ; i < list.size() ; i++) { |
|
|
|
|