diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java index 23d377850..77991e72e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -12,6 +12,7 @@ import java.util.Map; import com.iformall.annotation.SystemControllerLog; import com.iformall.controller.base.BaseController; +import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.po.WxCouponOrder; import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.service.WxCUserBasicInfoService; @@ -165,7 +166,11 @@ public class WxCUserDataController extends BaseController { params.put("startTime", startTime); params.put("endTime", endTime); params.put("tenantId", getTenantId()); - List list = wxUserVisitService.touchUsersReportList(params); + MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); + markingCouponDataReportDto.setTenantId(getTenantId()); + markingCouponDataReportDto.setStartTime(startTime); + markingCouponDataReportDto.setEndTime(endTime); + List list = wxUserVisitService.touchUsersReportList(markingCouponDataReportDto); Map dateMap = new HashMap<>(); for (TouchUsersReportVo vo : list) { dateMap.put(vo.getxTime(), vo); diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java index 8b3ad4ff2..42c9340dd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java @@ -1,17 +1,27 @@ package com.iformall.domain.dto; +import com.iformall.domain.po.BaseEntity; + import java.util.Date; /** * Created by syf on 2018/8/30. */ -public class MarkingCouponDataReportDto { +public class MarkingCouponDataReportDto extends BaseEntity{ private Date startTime; private Date endTime; private Integer type; private Integer couponType; private String couponTitle; + private String tenantId; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + public Integer getType() { return type; @@ -50,4 +60,12 @@ public class MarkingCouponDataReportDto { public void setCouponTitle(String couponTitle) { this.couponTitle = couponTitle; } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 444c14aa4..8ebe07feb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -14,8 +14,7 @@ import java.util.UUID; @Table(name = "wx_c_user") @JsonIgnoreProperties(ignoreUnknown = true) -public class WxCUser implements Serializable { - private static final long serialVersionUID = 1L; +public class WxCUser extends BaseEntity { @Id protected Long id; @@ -33,9 +32,11 @@ public class WxCUser implements Serializable { public void setId(Long id) { this.id = id; } - + + @Override public String getSortColumns() { - return sortColumns; + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } public List getIds() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index b3e064876..da36e110d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -13,9 +13,8 @@ import java.util.List; import java.util.Objects; @Table(name = "wx_c_user_basic_info") -public class WxCUserBasicInfo implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxCUserBasicInfo extends BaseEntity { + @Id protected Long id; @@ -31,11 +30,14 @@ public class WxCUserBasicInfo implements Serializable { public void setId(Long id) { this.id = id; } - + + @Override public String getSortColumns() { - return sortColumns; + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } - + + public List getIds() { return ids; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java index 09b0f6dc9..2712395b3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java @@ -9,8 +9,7 @@ import java.io.Serializable; import java.util.Date; @Table(name = "wx_car_pay_record") -public class WxCarPayRecord implements Serializable { - private static final long serialVersionUID = 1243232432423L; +public class WxCarPayRecord extends BaseEntity { @Id private Long id; @@ -57,6 +56,11 @@ public class WxCarPayRecord implements Serializable { @io.swagger.annotations.ApiModelProperty(value="是否缴费",name="isPay") private Integer isPay; + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } public Date getFeeTime() { return feeTime; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 57322feae..cf65ffab2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -12,9 +12,7 @@ import java.util.Date; import java.util.List; @Table(name = "wx_coupon") -public class WxCoupon implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxCoupon extends BaseEntity { @Id protected Long id; @@ -40,8 +38,10 @@ public class WxCoupon implements Serializable { this.id = id; } + @Override public String getSortColumns() { - return sortColumns; + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } public List getIds() { @@ -202,10 +202,6 @@ public class WxCoupon implements Serializable { this.wxCouponStatisVo = wxCouponStatisVo; } - public static long getSerialVersionUID() { - return serialVersionUID; - } - public String getTenantId() { return tenantId; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 137ada341..fa5479071 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -3,14 +3,11 @@ package com.iformall.domain.po; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.Date; import java.util.List; @Table(name = "wx_coupon_send") -public class WxCouponSend implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxCouponSend extends BaseEntity { @Id protected Long id; @@ -27,8 +24,10 @@ public class WxCouponSend implements Serializable { this.id = id; } + @Override public String getSortColumns() { - return sortColumns; + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } public List getIds() { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java index bc234bfd8..fa4434a8c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java @@ -1,12 +1,12 @@ package com.iformall.domain.vo; +import com.iformall.domain.po.BaseEntity; import lombok.Data; import java.io.Serializable; @Data -public class WxOrderGroupMarketing implements Serializable { - private static final long serialVersionUID = 1L; +public class WxOrderGroupMarketing extends BaseEntity { private String tenantId; private String couponId; @@ -22,4 +22,10 @@ public class WxOrderGroupMarketing implements Serializable { private String verifyRatio; private String totalPeople; + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java index 5e5ca7c2a..f18091e51 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java @@ -2,6 +2,7 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; +import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.vo.MarkingSceneDataReportVo; import com.iformall.domain.vo.MarkingSceneDataVo; import org.apache.ibatis.annotations.Param; @@ -15,7 +16,7 @@ public interface WxCouponActionLogMapper extends CommonMapper sceneDataMapJoinCouponOrder(HashMap params); - List sceneDataList(HashMap params); + List sceneDataList(MarkingCouponDataReportDto markingCouponDataReportDto); List sceneDataJoinCouponOrderList(HashMap params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java index c3595b590..b9e590274 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java @@ -1,6 +1,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; +import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.po.WxUserVisit; import com.iformall.domain.vo.TouchUsersReportVo; @@ -11,7 +12,7 @@ public interface WxUserVisitMapper extends CommonMapper { List findList(WxUserVisit wxUserVisit); - List touchUsersReportList(HashMap params); + List touchUsersReportList(MarkingCouponDataReportDto markingCouponDataReportDto); List touchUsersReportData(HashMap params); diff --git a/mallinkService/src/main/java/com/iformall/service/WxUserVisitService.java b/mallinkService/src/main/java/com/iformall/service/WxUserVisitService.java index 47494b438..bfe3aaae3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxUserVisitService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxUserVisitService.java @@ -2,6 +2,7 @@ package com.iformall.service; import java.util.*; import com.github.pagehelper.PageInfo; +import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.po.WxUserVisit; import com.iformall.domain.vo.TouchUsersReportVo; @@ -48,7 +49,7 @@ public interface WxUserVisitService { void deleteById(Long id); - List touchUsersReportList(HashMap params); + List touchUsersReportList(MarkingCouponDataReportDto markingCouponDataReportDto); Long queryVisitUv(HashMap params); 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 da87c7809..63cbdfedf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -285,34 +285,41 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override public PageInfo getSceneDataList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { + MarkingCouponDataReportDto queryDto = new MarkingCouponDataReportDto(); + queryDto.setTenantId(tenantId); + HashMap params = new HashMap<>(); params.put("tenantId", tenantId); - if (markingCouponDataReportDto.getStartTime() != null) - params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); - if (markingCouponDataReportDto.getEndTime() != null) + + if (markingCouponDataReportDto.getStartTime() != null) { + params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(), 0)); + queryDto.setStartTime(convertDateAndAdd(markingCouponDataReportDto.getStartTime(), 0)); + } + if (markingCouponDataReportDto.getEndTime() != null) { params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); + queryDto.setEndTime(convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); + } //停车发券数 停车发券被核销数, 核销发券数 核销发券被核销数, B端刷卡支付发券数 刷卡支付发券被核销数 PageHelper.startPage(pageIndex, pageSize); List list; if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())) { params.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode()); - list = wxCouponActionLogMapper.sceneDataList(params); + list = wxCouponActionLogMapper.sceneDataList(queryDto); }else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())) { params.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode()); - list = wxCouponActionLogMapper.sceneDataList(params); + list = wxCouponActionLogMapper.sceneDataList(queryDto); }else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())){ params.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode()); - list = wxCouponActionLogMapper.sceneDataList(params); + list = wxCouponActionLogMapper.sceneDataList(queryDto); }else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())){ params.put("channelType", EnumCouponSendSendType.C_ORDER.getCode()); - list = wxCouponActionLogMapper.sceneDataList(params); - }else { + list = wxCouponActionLogMapper.sceneDataList(queryDto); + }else{ PageHelper.clearPage(); list = new ArrayList<>(); } - Map countMap = new HashMap<>(); if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 @@ -425,19 +432,22 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { public Map getSceneDataHistory(String tenantId,String startDate, String endDate) { Map result = new HashedMap(); - HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); - if (StringUtils.isNotBlank(startDate)) - params.put("startTime", startDate); - if (StringUtils.isNotBlank(endDate)) - params.put("endTime", endDate); + MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); + markingCouponDataReportDto.setTenantId(tenantId); + + //if (StringUtils.isNotBlank(startDate)) + //markingCouponDataReportDto.setStartTime(startDate); + // if (StringUtils.isNotBlank(endDate)) + //markingCouponDataReportDto.setEndTime(endDate); + List days = DateUtils.getTjTimeList(startDate.substring(0,10),endDate.substring(0,10),"0"); TreeMap historyMap = new TreeMap<>(); //停车发券 - params.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode()); - List carStopList = wxCouponActionLogMapper.sceneDataList(params); +// params.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode()); +// markingCouponDataReportDto.setCouponType(); + List carStopList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); Map countMap = carStopList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getSendCount())); for (String date:days) { historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); @@ -449,8 +459,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { result.put("carStopHistory",historyMap); //核销发券 - params.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode()); - List couponVerifyList = wxCouponActionLogMapper.sceneDataList(params); +// params.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode()); + List couponVerifyList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); countMap = couponVerifyList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getSendCount())); historyMap = new TreeMap<>(); for (String date:days) { @@ -463,8 +473,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { result.put("couponVerifyHistory",historyMap); //交易发券 - params.put("channelType", EnumCouponSendSendType.C_ORDER.getCode()); - List orderList = wxCouponActionLogMapper.sceneDataList(params); + //params.put("channelType", EnumCouponSendSendType.C_ORDER.getCode()); + List orderList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); countMap = orderList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getSendCount())); historyMap = new TreeMap<>(); for (String date:days) { @@ -477,8 +487,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { result.put("orderHistory",historyMap); //收银台发券 - params.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode()); - List micropayList = wxCouponActionLogMapper.sceneDataList(params); + // params.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode()); + List micropayList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); countMap = micropayList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getSendCount())); historyMap = new TreeMap<>(); for (String date:days) { @@ -638,17 +648,14 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override public PageInfo getTouchUsersReportList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { - //查询UV PV - HashMap params1 = new HashMap<>(); - params1.put("tenantId", tenantId); + markingCouponDataReportDto.setTenantId(tenantId); if (markingCouponDataReportDto.getStartTime() != null) - params1.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); + markingCouponDataReportDto.setStartTime(convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) - params1.put("endTime", markingCouponDataReportDto.getEndTime()); + markingCouponDataReportDto.setEndTime(markingCouponDataReportDto.getEndTime()); PageHelper.startPage(pageIndex, pageSize); - List wxUserVisitList = wxUserVisitMapper.touchUsersReportList(params1); - + List wxUserVisitList = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); //获取领取人数 //获取领取量 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 148a0ccbf..8e4a38c5e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; import com.iformall.domain.vo.*; @@ -933,7 +934,6 @@ public class WxChartServiceImpl implements WxChartDataService { */ private ResultData getActiveMemberCount(String tenantId) { HashMap datamap = new HashMap<>(); - HashMap params = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); c.set(Calendar.HOUR_OF_DAY, 0); @@ -942,10 +942,11 @@ public class WxChartServiceImpl implements WxChartDataService { Date endTime = c.getTime(); c.add(Calendar.DAY_OF_YEAR, -30); Date startTime = c.getTime(); - params.put("startTime", startTime); - params.put("endTime", endTime); - params.put("tenantId", tenantId); - List list = wxUserVisitMapper.touchUsersReportList(params); + MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); + markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.setStartTime(startTime); + markingCouponDataReportDto.setEndTime(endTime); + List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); String yesterday = DateUtils.getTimeBefore(1, new Date()); List collect = list.parallelStream().filter(x -> x.getxTime().equals(yesterday)).collect(Collectors.toList()); int yesterdayCount = 0; @@ -1039,7 +1040,6 @@ public class WxChartServiceImpl implements WxChartDataService { */ private ResultData getActiveMemberCountInWeek(String tenantId) { HashMap datamap = new HashMap<>(); - HashMap params = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1048,10 +1048,11 @@ public class WxChartServiceImpl implements WxChartDataService { Date endTime = c.getTime(); c.add(Calendar.DAY_OF_YEAR, -7); Date startTime = c.getTime(); - params.put("startTime", startTime); - params.put("endTime", endTime); - params.put("tenantId", tenantId); - List list = wxUserVisitMapper.touchUsersReportList(params); + MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); + markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.setStartTime(startTime); + markingCouponDataReportDto.setEndTime(endTime); + List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); Map dateMap = new HashMap<>(); for (TouchUsersReportVo vo : list) { dateMap.put(vo.getxTime(), vo); @@ -1167,7 +1168,6 @@ public class WxChartServiceImpl implements WxChartDataService { private ResultData getActiveMemberAnalysis(String tenantId) { HashMap datamap = new HashMap<>(); - HashMap params = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1176,10 +1176,11 @@ public class WxChartServiceImpl implements WxChartDataService { Date endTime = c.getTime(); c.add(Calendar.DAY_OF_YEAR, -30); Date startTime = c.getTime(); - params.put("startTime", startTime); - params.put("endTime", endTime); - params.put("tenantId", tenantId); - List list = wxUserVisitMapper.touchUsersReportList(params); + MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); + markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.setStartTime(startTime); + markingCouponDataReportDto.setEndTime(endTime); + List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); Map dateMap = new HashMap<>(); for (TouchUsersReportVo vo : list) { dateMap.put(vo.getxTime(), vo); @@ -1222,7 +1223,6 @@ public class WxChartServiceImpl implements WxChartDataService { */ private ResultData getActiveMemberTrade(String tenantId) { HashMap datamap = new HashMap<>(); - HashMap params = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1231,10 +1231,11 @@ public class WxChartServiceImpl implements WxChartDataService { Date endTime = c.getTime(); c.add(Calendar.DAY_OF_YEAR, -30); Date startTime = c.getTime(); - params.put("startTime", startTime); - params.put("endTime", endTime); - params.put("tenantId", tenantId); - List list = wxUserVisitMapper.touchUsersReportList(params); + MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); + markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.setStartTime(startTime); + markingCouponDataReportDto.setEndTime(endTime); + List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); Map dateMap = new HashMap<>(); for (TouchUsersReportVo vo : list) { dateMap.put(vo.getxTime(), vo); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java index 97eafd65f..5075f5413 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.po.WxUserVisit; import com.iformall.domain.vo.TouchUsersReportVo; import com.iformall.mapper.WxUserVisitMapper; @@ -54,8 +55,8 @@ public class WxUserVisitServiceImpl implements WxUserVisitService { } @Override - public List touchUsersReportList(HashMap params) { - return wxUserVisitMapper.touchUsersReportList(params); + public List touchUsersReportList(MarkingCouponDataReportDto markingCouponDataReportDto) { + return wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index ccd29b78b..097bf9bc7 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -84,6 +84,11 @@ and `name` like concat('%', #{name},'%') + + + and `level` like concat('%', #{level},'%') + + and `create_date` between #{startTime} and #{endTime} diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index fc8cf841a..75c45f9c4 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -270,7 +270,8 @@ #{scene} - order by create_date desc + order by ${sortColumns} + order by create_date desc