diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java index e5ae1bccc..8f9b90d88 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java @@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.WxCUserCar; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -15,4 +16,5 @@ public interface WxCUserCarMapper extends CommonMapper { long queryCarCount(Map carParams); -} + List> queryCarCountHistory(HashMap params); +} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java index cd560d2c0..a25b72fb7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java @@ -18,7 +18,7 @@ public interface WxCarCmdLogMapper extends CommonMapper { List> queryTodayCar(HashMap params); - List> queryWeekCarPay(HashMap params); + List> queryWeekCarPay(HashMap params); List queryForSceneRepotyHistoryCar(HashMap params); @@ -26,5 +26,5 @@ public interface WxCarCmdLogMapper extends CommonMapper { String queryTenantIdBySynId(HashMap params); - Long queryWeekCarPayCount(HashMap params); + Long queryWeekCarPayCount(HashMap params); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index f0cf2fcfc..9bd5ee7b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxBillAll; import com.iformall.enums.*; @@ -510,10 +511,10 @@ public class DataTowerServiceImpl implements DataTowerService { datamap.put("history", historymap); // 查询近一周的缴费车辆----start------ - HashMap weekParams = new HashMap<>(); + HashMap weekParams = new HashMap<>(); weekParams.put("tenantId", tenantId); String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); - String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date());; + String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); weekParams.put("enddate", oneWeekEndDate + " 23:59:59"); weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); @@ -538,6 +539,39 @@ public class DataTowerServiceImpl implements DataTowerService { weekMap.put(key,weekCollect.get(key)); } datamap.put("oneWeekCarPayFeeCount",weekMap); + + // 近一周新增会员历史 + List> carCountHistory = wxCUserCarMapper.queryCarCountHistory(weekParams); + Map weekCarCollect = carCountHistory.stream().collect(Collectors.toMap(m -> { + return (String)m.get("create_time"); + }, m -> { + return m.get("count"); + })); + TreeMap weekCarMap = new TreeMap<>(); + for (String date:days) { + weekCarMap.put(date.substring(5,date.length()).replace("-","/"),"0"); + } + for (String key : weekCarCollect.keySet()) { + weekCarMap.put(key,weekCarCollect.get(key)); + } + datamap.put("oneWeekNewCarUserHistory",weekCarMap); + + //近一周新增停车会员数 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); + wxCUserBasicInfoDto.setTenantId(tenantId); + try { + wxCUserBasicInfoDto.setStartTime(sdf.parse(oneWeekStartdate)); + wxCUserBasicInfoDto.setEndTime(sdf.parse(oneWeekEndDate)); + }catch (Exception e){ + e.printStackTrace(); + } + datamap.put("oneWeekNewCarUserCount",wxCUserCarMapper.countUser(wxCUserBasicInfoDto)); + //停车会员总数 + wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); + wxCUserBasicInfoDto.setTenantId(tenantId); + datamap.put("newCarUserSumCount",wxCUserCarMapper.countUser(wxCUserBasicInfoDto)); + // 查询近一周的缴费车辆----end------ //今日车流量 diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml index a517896d3..46f642896 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml @@ -96,4 +96,12 @@ + +