From e3ca290be1792bf0bc18aa7c30afa712b0598cab Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 27 Oct 2020 15:41:24 +0800 Subject: [PATCH] bug --- .../service/impl/MarkingDataReportServiceImpl.java | 4 +++- .../service/impl/WxCUserTagsServiceImpl.java | 2 +- .../iformall/service/impl/WxChartServiceImpl.java | 4 ++-- .../main/resources/mapper/WxCarCmdLogMapper.xml | 4 +++- .../resources/mapper/WxCouponActionLogMapper.xml | 8 ++++++-- .../src/main/resources/mapper/WxCouponMapper.xml | 8 +++++--- .../main/resources/mapper/WxCouponOrderMapper.xml | 14 +++++++++++--- .../main/resources/mapper/WxOrderGroupMapper.xml | 4 ++-- .../src/main/resources/mapper/WxOrderMapper.xml | 4 +++- 9 files changed, 36 insertions(+), 16 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 4f58c5c89..440e6dae3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -343,8 +343,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { public PageInfo getSceneDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); MarkingCouponDataReportDto queryDto = new MarkingCouponDataReportDto(); - queryDto.setTenantEntitys(tenantEntitys); org.springframework.beans.BeanUtils.copyProperties(markingCouponDataReportDto, queryDto); + queryDto.setTenantEntitys(tenantEntitys); queryDto.updateTenantInfo(tenantEntity); HashMap params = new HashMap<>(); @@ -391,6 +391,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { Map countMap = new HashMap<>(); params.clear(); + params.put("tenantEntitys",tenantEntitys); params.put("tenantId", tenantEntity.getTenantId()); if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { params.put("parentTenantId", tenantEntity.getParentTenantId()); @@ -445,6 +446,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { Map triggerCountMap = new HashMap<>(); params.clear(); + params.put("tenantEntitys",tenantEntitys); params.put("tenantId", tenantEntity.getTenantId()); if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { params.put("parentTenantId", tenantEntity.getParentTenantId()); 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 945dd442f..3853c37ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -91,7 +91,7 @@ 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.getTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime); + return wxCUserTagsMapper.countUser(str, tenantEntity.getFinalTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime); } 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 a96c1a59d..6042d0656 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2254,7 +2254,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.getTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime)); + tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getFinalTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime)); tagList.add(tag); total -= tag.getCount(); } @@ -2289,7 +2289,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.getTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime)); + tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getFinalTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime)); tagList.add(tag); total -= tag.getCount(); } diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index 6ffdca2be..d1e0e59d4 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -139,7 +139,9 @@ select DATE_FORMAT(update_date,'%Y-%m-%d') xTime, count(c.id) triggerCount - from wx_coupon_order c + from ( + SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix} + ) c where c.coupon_order_status = 1 and c.`tenant_id` = #{tenantId} @@ -288,7 +290,9 @@ select DATE_FORMAT(update_date,'%Y-%m-%d') xTime, count(c.id) triggerCount - from wx_coupon_order c left join wx_coupon_action_log cal on cal.tenant_id = c.tenant_id + from ( + SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix} + ) c left join ( + SELECT * from wx_coupon_action_log${tenantEntity.shardTableSuffix} + ) cal on cal.tenant_id = c.tenant_id where cal.coupon_order_id=c.id and c.`tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index c9a4d1952..8e27db23b 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -146,10 +146,10 @@ and c.`parent_tenant_id` = #{marketing.parentTenantId} - + and c.coupon_id=#{marketing.couponId} - + and c.title like concat('%',#{marketing.title},'%') order by ${marketing.sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 670fa752f..6664644af 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -551,7 +551,9 @@