diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 6c16276e7..4bf7aeb5c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -6,6 +6,7 @@ import com.iformall.domain.vo.WxMerchantVo; import java.util.HashMap; import java.util.List; +import java.util.Map; public interface WxMerchantMapper extends CommonMapper { @@ -16,4 +17,6 @@ public interface WxMerchantMapper extends CommonMapper { WxMerchant queryMerchantByMerchantIdOfSharingReceiver(WxMerchant wxMerchant); List findQrcodeEmptyList(); + + List> findBusByFloorId(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 7d31ec6e6..94110d4c1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.domain.vo.*; import com.iformall.enums.*; import com.iformall.mapper.*; import com.iformall.service.MarkingDataReportService; +import com.iformall.service.WxBusinessService; import com.iformall.service.WxChartDataService; import com.iformall.service.WxCouponService; import com.iformall.utils.DateUtils; @@ -76,6 +77,8 @@ public class WxChartServiceImpl implements WxChartDataService { WxBillAllMapper wxBillAllMapper; @Autowired MarkingDataReportService markingDataReportService; + @Autowired + WxBusinessService wxBusinessService; @Override public ResultData queryData(Map paramsMap) { @@ -321,14 +324,23 @@ public class WxChartServiceImpl implements WxChartDataService { } /** - * 首页商铺出租率走势 + * 业态分析 * @param tenantId * @return */ - private ResultData getBusiness(String tenantId,Map paramsMap) { - Map resultMap = new LinkedMap(); - - + private ResultData getBusiness(String tenantId,Map paramsMap){ + Map resultMap = new LinkedMap(); + List businessList = wxBusinessService.findList(new WxBusiness()); + for (WxBusiness b:businessList) { + resultMap.put(b.getTitle(),0l); + } + Map query = new HashedMap(); + query.put("tenantId",tenantId); + query.put("id",paramsMap.get("id")); + List> mapList = wxMerchantMapper.findBusByFloorId(query); + for (Map map:mapList) { + resultMap.put((String)map.get("btitle"),(Long)map.get("count")); + } return new ResultData(resultMap); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 14d67601d..ee84e6c08 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -234,5 +234,13 @@ select * from wx_merchant where qr_code is null; - +