| @@ -62,7 +62,7 @@ public class TenantInfoImpl implements TenantInfo { | |||||
| "fengniao_map_config", | "fengniao_map_config", | ||||
| "wx_c_user", | "wx_c_user", | ||||
| "tt_c_user", | "tt_c_user", | ||||
| "wx_c_user_car", | |||||
| "wx_user_visit", | |||||
| }; | }; | ||||
| @@ -72,6 +72,7 @@ public class TenantInfoImpl implements TenantInfo { | |||||
| "wx_authorizer_info", | "wx_authorizer_info", | ||||
| "wx_c_user", | "wx_c_user", | ||||
| "tt_c_user", | "tt_c_user", | ||||
| "wx_user_visit", | |||||
| "wx_c_user_car", | "wx_c_user_car", | ||||
| "wx_c_user_from_b", | "wx_c_user_from_b", | ||||
| "wx_c_user_tags", | "wx_c_user_tags", | ||||
| @@ -51,7 +51,7 @@ public class TenantInfoImpl implements TenantInfo { | |||||
| "fengniao_map_config", | "fengniao_map_config", | ||||
| "wx_c_user", | "wx_c_user", | ||||
| "tt_c_user", | "tt_c_user", | ||||
| "wx_c_user_car", | |||||
| "wx_user_visit", | |||||
| }; | }; | ||||
| private static String[] filterSubTables = new String[] { | private static String[] filterSubTables = new String[] { | ||||
| @@ -60,6 +60,7 @@ public class TenantInfoImpl implements TenantInfo { | |||||
| "wx_authorizer_info", | "wx_authorizer_info", | ||||
| "wx_c_user", | "wx_c_user", | ||||
| "tt_c_user", | "tt_c_user", | ||||
| "wx_user_visit", | |||||
| "wx_c_user_basic_info", | "wx_c_user_basic_info", | ||||
| "user_basic_info_address", | "user_basic_info_address", | ||||
| "wx_c_user_basic_child", | "wx_c_user_basic_child", | ||||
| @@ -56,7 +56,7 @@ public class TenantInfoImpl implements TenantInfo { | |||||
| "fengniao_map_config", | "fengniao_map_config", | ||||
| "wx_c_user", | "wx_c_user", | ||||
| "tt_c_user", | "tt_c_user", | ||||
| "wx_c_user_car", | |||||
| "wx_user_visit", | |||||
| }; | }; | ||||
| private static String[] filterSubTables = new String[] { | private static String[] filterSubTables = new String[] { | ||||
| @@ -65,6 +65,7 @@ public class TenantInfoImpl implements TenantInfo { | |||||
| "wx_authorizer_info", | "wx_authorizer_info", | ||||
| "wx_c_user", | "wx_c_user", | ||||
| "tt_c_user", | "tt_c_user", | ||||
| "wx_user_visit", | |||||
| "wx_c_user_basic_info", | "wx_c_user_basic_info", | ||||
| "user_basic_info_address", | "user_basic_info_address", | ||||
| "wx_c_user_basic_child", | "wx_c_user_basic_child", | ||||
| @@ -56,7 +56,7 @@ public class TenantInfoImpl implements TenantInfo { | |||||
| "fengniao_map_config", | "fengniao_map_config", | ||||
| "wx_c_user", | "wx_c_user", | ||||
| "tt_c_user", | "tt_c_user", | ||||
| "wx_c_user_car", | |||||
| "wx_user_visit", | |||||
| }; | }; | ||||
| private static String[] filterSubTables = new String[] { | private static String[] filterSubTables = new String[] { | ||||
| @@ -65,6 +65,7 @@ public class TenantInfoImpl implements TenantInfo { | |||||
| "wx_authorizer_info", | "wx_authorizer_info", | ||||
| "wx_c_user", | "wx_c_user", | ||||
| "tt_c_user", | "tt_c_user", | ||||
| "wx_user_visit", | |||||
| "wx_c_user_basic_info", | "wx_c_user_basic_info", | ||||
| "user_basic_info_address", | "user_basic_info_address", | ||||
| "wx_c_user_basic_child", | "wx_c_user_basic_child", | ||||
| @@ -10,7 +10,7 @@ import java.util.*; | |||||
| @TableName(value = "wx_user_visit") | @TableName(value = "wx_user_visit") | ||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxUserVisit extends TenantEntity { | |||||
| public class WxUserVisit extends TenantEntity { | |||||
| protected Long id; | protected Long id; | ||||
| @@ -91,4 +91,6 @@ public interface WxMallService { | |||||
| ResultData addAadmin(WxMall wxMall); | ResultData addAadmin(WxMall wxMall); | ||||
| boolean mallValid(Long loginUserId,WxMall mall); | boolean mallValid(Long loginUserId,WxMall mall); | ||||
| boolean isgroupSupport(TenantEntity tenantEntity); | |||||
| } | } | ||||
| @@ -4,6 +4,7 @@ import java.util.*; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.dto.MarkingCouponDataReportDto; | import com.iformall.domain.dto.MarkingCouponDataReportDto; | ||||
| import com.iformall.domain.po.WxUserVisit; | import com.iformall.domain.po.WxUserVisit; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.vo.TouchUsersReportVo; | import com.iformall.domain.vo.TouchUsersReportVo; | ||||
| public interface WxUserVisitService { | public interface WxUserVisitService { | ||||
| @@ -32,7 +33,7 @@ public interface WxUserVisitService { | |||||
| * @param id | * @param id | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| WxUserVisit getById(Long id); | |||||
| WxUserVisit getById(Long id, TenantEntity tenantEntity); | |||||
| /** | /** | ||||
| * 保存或更新实体 | * 保存或更新实体 | ||||
| @@ -46,7 +47,7 @@ public interface WxUserVisitService { | |||||
| * | * | ||||
| * @param id | * @param id | ||||
| */ | */ | ||||
| void deleteById(Long id); | |||||
| void deleteById(Long id, TenantEntity tenantEntity); | |||||
| List<TouchUsersReportVo> touchUsersReportList(MarkingCouponDataReportDto markingCouponDataReportDto); | List<TouchUsersReportVo> touchUsersReportList(MarkingCouponDataReportDto markingCouponDataReportDto); | ||||
| @@ -91,6 +91,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc | |||||
| @Autowired | @Autowired | ||||
| WxTagsService wxTagsService; | WxTagsService wxTagsService; | ||||
| @Autowired | |||||
| WxMallService wxMallService; | |||||
| /***************user filter start******************************************/ | /***************user filter start******************************************/ | ||||
| @@ -1171,6 +1174,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc | |||||
| @Override | @Override | ||||
| public long findCount(WxCUserBasicInfoDto dto) { | public long findCount(WxCUserBasicInfoDto dto) { | ||||
| if(wxMallService.isgroupSupport(dto)){ | |||||
| dto.setTenantId(null); | |||||
| } | |||||
| return wxCUserBasicInfoMapper.findCount(dto); | return wxCUserBasicInfoMapper.findCount(dto); | ||||
| } | } | ||||
| @@ -386,4 +386,14 @@ public class WxMallServiceImpl implements WxMallService { | |||||
| return false; | return false; | ||||
| } | } | ||||
| @Override | |||||
| public boolean isgroupSupport(TenantEntity tenantEntity) { | |||||
| WxMall mall = this.getByTenantId(tenantEntity.getTenantId()); | |||||
| if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && | |||||
| StringUtils.isBlank(mall.getParentTenantId())) { | |||||
| return true; | |||||
| } | |||||
| return false; | |||||
| } | |||||
| } | } | ||||
| @@ -1,10 +1,13 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import java.util.*; | import java.util.*; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.dto.MarkingCouponDataReportDto; | import com.iformall.domain.dto.MarkingCouponDataReportDto; | ||||
| import com.iformall.domain.po.WxUserVisit; | import com.iformall.domain.po.WxUserVisit; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.vo.TouchUsersReportVo; | import com.iformall.domain.vo.TouchUsersReportVo; | ||||
| import com.iformall.mapper.WxUserVisitMapper; | import com.iformall.mapper.WxUserVisitMapper; | ||||
| import com.iformall.service.WxUserVisitService; | import com.iformall.service.WxUserVisitService; | ||||
| @@ -16,6 +19,7 @@ import com.iformall.common.IdWorker; | |||||
| @Service | @Service | ||||
| public class WxUserVisitServiceImpl implements WxUserVisitService { | public class WxUserVisitServiceImpl implements WxUserVisitService { | ||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| @Autowired | @Autowired | ||||
| @@ -33,8 +37,11 @@ public class WxUserVisitServiceImpl implements WxUserVisitService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxUserVisit getById(Long id) { | |||||
| return wxUserVisitMapper.selectById(id); | |||||
| public WxUserVisit getById(Long id, TenantEntity tenantEntity) { | |||||
| WxUserVisit record = new WxUserVisit(); | |||||
| record.updateTenantInfo(tenantEntity); | |||||
| record.setId(id); | |||||
| return wxUserVisitMapper.selectOne(new QueryWrapper<>(record)); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -50,8 +57,11 @@ public class WxUserVisitServiceImpl implements WxUserVisitService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | |||||
| wxUserVisitMapper.deleteById(id); | |||||
| public void deleteById(Long id, TenantEntity tenantEntity) { | |||||
| WxUserVisit record = new WxUserVisit(); | |||||
| record.updateTenantInfo(tenantEntity); | |||||
| record.setId(id); | |||||
| wxUserVisitMapper.delete(new QueryWrapper<>(record)); | |||||
| } | } | ||||
| @Override | @Override | ||||