diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 3755b59b2..b72248438 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -86,6 +86,8 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxCouponActionLogMapper.getCountByUserAndCoupon".equals(ms.getId())) return true; + if ("com.iformall.mapper.WxShopMapper.rentRateHistory".equals(ms.getId())) + return true; return false; } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxShopRentRateVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxShopRentRateVo.java new file mode 100644 index 000000000..12ee42c5e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxShopRentRateVo.java @@ -0,0 +1,26 @@ +package com.iformall.domain.vo; + +import com.iformall.domain.po.BaseEntity; + + +public class WxShopRentRateVo extends BaseEntity { + private String xTime; + private String rate; + + + public String getxTime() { + return xTime; + } + + public void setxTime(String xTime) { + this.xTime = xTime; + } + + public String getRate() { + return rate; + } + + public void setRate(String rate) { + this.rate = rate; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index 5e98cef25..5617e1700 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxShop; import com.iformall.domain.vo.WxShopVo; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -33,4 +34,7 @@ public interface WxShopMapper extends CommonMapper { List findShopVoList(Map map); Long getCountByWxShop(WxShop wxShop); + + List> rentRateHistory(Map params); + } 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 0bb91605f..4b530b132 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -15,7 +15,9 @@ import com.iformall.service.MarkingDataReportService; import com.iformall.service.WxChartDataService; import com.iformall.service.WxCouponService; import com.iformall.utils.DateUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.collections.map.LinkedMap; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -321,16 +323,29 @@ public class WxChartServiceImpl implements WxChartDataService { private ResultData getRentRateHistory(String tenantId,Map paramsMap) { Integer dateType = Integer.parseInt(paramsMap.get("dateType")); - Map datamap = new LinkedHashMap<>(); - datamap.put("2018/10","10%"); - datamap.put("2018/11","20%"); - datamap.put("2018/12","10%"); - datamap.put("2019/01","10%"); - datamap.put("2019/02","30%"); - datamap.put("2019/03","40%"); - datamap.put("2019/04","10%"); - datamap.put("2019/05","20%"); - return new ResultData(datamap); + Map queryMap = new HashMap<>(); + queryMap.put("tenantId",tenantId); + queryMap.put("dateType",dateType); + List> mapList = wxShopMapper.rentRateHistory(queryMap); + if(CollectionUtils.isNotEmpty(mapList)){ + String startTime = (String)mapList.get(0).get("xTime"); + String endTime = (String)mapList.get(mapList.size()-1).get("xTime"); + List days = DateUtils.getTjTimeList(startTime, endTime, 1==dateType.intValue()?"0":"1"); + Map map = getMap(days); + for (Map m : mapList) { + map.put((String)m.get("xTime"),m.get("rate")+"%"); + } + return new ResultData(map); + } + return new ResultData(new LinkedHashMap<>()); + } + + public Map getMap(List days){ + Map map = new LinkedMap(); + for (String d:days) { + map.put(d.replace("-", "/"),"0%"); + } + return map; } /** diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 09f048caf..bee09966b 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -527,6 +527,12 @@ + + + + + + +