From bb0c4d506eb48cef1a83eee119859a9baeda7eda Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 20 Jan 2022 18:39:47 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/mapper/WxCUserTagsMapper.java | 3 +- .../service/impl/WxCUserTagsServiceImpl.java | 12 ++++- .../service/impl/WxChartServiceImpl.java | 6 +-- .../main/resources/mapper/TtCUserMapper.xml | 6 +++ .../mapper/WxCUserBasicInfoMapper.xml | 8 +++- .../resources/mapper/WxCUserCarMapper.xml | 3 +- .../resources/mapper/WxCUserFromMapper.xml | 3 +- .../resources/mapper/WxCUserTagsMapper.xml | 45 +++++++------------ 8 files changed, 48 insertions(+), 38 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java index e3e585aed..f9af4a229 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java @@ -16,8 +16,7 @@ public interface WxCUserTagsMapper extends CommonMapper { List findList(WxCUserTags wxCUserTags); List findIdList(@Param("tenantId")String tenantId, @Param("tagIdList")List tagIdList); - long countUser(@Param("tagIds")String tagIds,@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId, - @Param("startTime")Date startTime,@Param("endTime")Date endTime); + List findUserIdList(@Param("tagIds")String tagIds,@Param("tenantId")String tenantId); void updateNewId(CUserTagNewIdVo record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index ef487af8f..5f4786e14 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; +import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCUserBasicTagVo; @@ -78,7 +79,16 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { @Override public long countUser(TenantEntity tenantEntity, Long tagId, Date startTime, Date endTime ) { String str = JSON.toJSONString(tagId); - return wxCUserTagsMapper.countUser(str, tenantEntity.getFinalTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime); + List userIds = wxCUserTagsMapper.findUserIdList(str, tenantEntity.getFinalTenantId()); + if(startTime == null && endTime == null){ + return (long)userIds.size(); + }else{ + WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); + dto.updateTenantInfo(tenantEntity); + dto.setStartTime(startTime); + dto.setEndTime(endTime); + return wxCUserBasicInfoMapper.findCount(dto); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 6af25ba38..67ed6e9fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -76,7 +76,7 @@ public class WxChartServiceImpl implements WxChartDataService { @Autowired WxLevelConfigMapper wxLevelConfigMapper; @Autowired - WxCUserTagsMapper wxCUserTagsMapper; + WxCUserTagsService wxCUserTagsService; @Lazy @Autowired @@ -2308,7 +2308,7 @@ public class WxChartServiceImpl implements WxChartDataService { for (int i = 0; i < tags.length; i++) { WxTags tag = new WxTags(); tag.setName(tags[i].getMessage()); - tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getFinalTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime)); + tag.setCount(wxCUserTagsService.countUser(tenantEntity,tags[i].getCode(), startTime, endTime)); tagList.add(tag); total -= tag.getCount(); } @@ -2344,7 +2344,7 @@ public class WxChartServiceImpl implements WxChartDataService { for (int i = 0; i < tags.length; i++) { WxTags tag = new WxTags(); tag.setName(tags[i].getMessage()); - tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getFinalTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime)); + tag.setCount(wxCUserTagsService.countUser(tenantEntity,tags[i].getCode(), startTime, endTime)); tagList.add(tag); total -= tag.getCount(); } diff --git a/mallinkService/src/main/resources/mapper/TtCUserMapper.xml b/mallinkService/src/main/resources/mapper/TtCUserMapper.xml index ac69725dd..b03e34229 100644 --- a/mallinkService/src/main/resources/mapper/TtCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtCUserMapper.xml @@ -242,6 +242,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and user_id in + + #{userIdItem} + + diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index d5f82b0d7..243decf71 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -147,7 +147,7 @@ #{idItem} - + - select from wx_c_user_tags where id = #{id} and tenant_id = #{tenantId} - - - - delete from wx_c_user_tags where id = #{id} and tenant_id = #{tenantId} - + + + + + delete from wx_c_user_tags + where id = #{id} and tenant_id = #{tenantId} + - select count(cut.user_id) from wx_c_user_tags cut, wx_c_user_basic_info cubi - where cut.user_id = cubi.id - and cubi.final_tenant_id = #{finalTenantId} - - and cut.tenant_id = #{tenantId} - - - and cubi.create_date >= #{startTime} - - - and cubi.create_date < #{endTime} - + - - +