diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 68229da56..6da0ada62 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -203,7 +203,6 @@ logging: com.iformall: debug path: ./logs/admin -debug: true swagger: services: a: / diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java index 6d645b78d..f6650ed34 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.WxCUserCar; +import com.iformall.domain.vo.cockpit.MonthDataMapping; import java.util.HashMap; import java.util.List; @@ -18,4 +19,12 @@ public interface WxCUserCarMapper extends CommonMapper { List> queryCarCountHistory(HashMap params); + /** + * 统计某年某月有车会员数 + * + * @param finalTenantId + * @param years + * @return {@link List}<{@link MonthDataMapping}> + */ + List groupByDate(String finalTenantId, List years); } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index 410d7f7ff..3f7487fa4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -49,5 +49,11 @@ public interface WxShopMapper extends CommonMapper { long findCount(WxShop wxShop); + /** + * 统计商铺出租和未出租的数量 + * + * @param tenantIds + * @return {@link List}<{@link CountShopByStatusDTO}> + */ List countShopByStatus(@Param("tenantIds") List tenantIds); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java index 60a9084f1..751f476ff 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java @@ -22,6 +22,7 @@ public interface WxUserVisitMapper extends CommonMapper { /** * 统计某年某月的uv数量 + * * @param finalTenantId * @param years * @return {@link List}<{@link MonthDataMapping}> diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallService.java b/mallinkService/src/main/java/com/iformall/service/WxMallService.java index 455da9387..fa7c874b9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallService.java @@ -87,6 +87,12 @@ public interface WxMallService { List listAsSelectMall(Long id); + /** + * 获取广场列表(集团版获取子广场列表,广场则直接返回该广场) + * + * @param tenantEntity + * @return {@link List}<{@link TenantEntity}> + */ List getTenantEntitys(TenantEntity tenantEntity); PageInfo listAadminAsPage(WxMall wxMall, Integer pageNum, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java index fdc02bbb0..3b9de15e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.domain.vo.cockpit.*; import com.iformall.enums.EnumShopStatus; import com.iformall.enums.EnumUserGender; import com.iformall.mapper.WxCUserBasicInfoMapper; +import com.iformall.mapper.WxCUserCarMapper; import com.iformall.mapper.WxShopMapper; import com.iformall.mapper.WxUserVisitMapper; import com.iformall.service.CockpitScreenService; @@ -40,6 +41,8 @@ public class CockpitScreenServiceImpl implements CockpitScreenService { private WxShopMapper wxShopMapper; @Autowired private WxUserVisitMapper wxUserVisitMapper; + @Autowired + private WxCUserCarMapper wxCUserCarMapper; @Override public CountUserGenderVO countUserGender(TenantEntity tenantEntity) { @@ -103,37 +106,49 @@ public class CockpitScreenServiceImpl implements CockpitScreenService { years.add(DateUtils.getYear(new Date())); } - List result = new ArrayList<>(); List mappings = cUserBasicInfoMapper.groupByDate(tenantInfo.getFinalTenantId(), years); - Map mappingMap = mappings.stream().collect(Collectors.toMap(MonthDataMapping::getName, MonthDataMapping::getCount)); - for (int i = 0; i < years.size(); i++) { - CountMonthVO vo = new CountMonthVO(); - List months = new ArrayList<>(); + return getResult(years, mappings); + } - for (int j = 0; j < 12; j++) { - MonthDataVO month = new MonthDataVO(); - month.setMonth(j + 1); - Integer count = mappingMap.get(years.get(i) + "-" + DateUtils.getMonthStr(j + 1)); - count = count != null ? count : 0; - month.setCount(count); - months.add(month); - } - vo.setYear(years.get(i)); - vo.setMonths(months); - result.add(vo); + @Override + public List countReachUser(TenantEntity tenantInfo, List years) { + if (CollectionUtils.isEmpty(years)) { + years.add(DateUtils.getYear(new Date())); } - return result; + List mappings = wxUserVisitMapper.groupByDate(tenantInfo.getFinalTenantId(), years); + return getResult(years, mappings); } @Override - public List countReachUser(TenantEntity tenantInfo, List years) { + public List countCar(TenantEntity tenantInfo, List years) { if (CollectionUtils.isEmpty(years)) { years.add(DateUtils.getYear(new Date())); } + List mappings = wxCUserCarMapper.groupByDate(tenantInfo.getFinalTenantId(), years); + return getResult(years, mappings); + } + + @Override + public List countOrderTrend(TenantEntity tenantInfo, Integer year) { + return null; + } + + @Override + public CountBasicVO countBasic() { + return null; + } + + /** + * 拼装某年某月数据 + * + * @param years + * @param mappings + * @return {@link List}<{@link CountMonthVO}> + */ + private List getResult(List years, List mappings) { List result = new ArrayList<>(); - List mappings = wxUserVisitMapper.groupByDate(tenantInfo.getFinalTenantId(), years); Map mappingMap = mappings.stream().collect(Collectors.toMap(MonthDataMapping::getName, MonthDataMapping::getCount)); for (int i = 0; i < years.size(); i++) { CountMonthVO vo = new CountMonthVO(); @@ -151,22 +166,6 @@ public class CockpitScreenServiceImpl implements CockpitScreenService { vo.setMonths(months); result.add(vo); } - return result; } - - @Override - public List countCar(TenantEntity tenantInfo, List years) { - return null; - } - - @Override - public List countOrderTrend(TenantEntity tenantInfo, Integer year) { - return null; - } - - @Override - public CountBasicVO countBasic() { - return null; - } } diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml index f9f660919..8c068837a 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml @@ -134,5 +134,20 @@ AND ubi.create_date BETWEEN #{startdate} AND #{enddate}) c GROUP BY c.create_time ORDER BY c.create_time +