diff --git a/mallinkService/src/main/java/com/simple/domain/vo/MarkingCouponDataReportVo.java b/mallinkService/src/main/java/com/simple/domain/vo/MarkingCouponDataReportVo.java index 12c9d2f59..ba7b2c570 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/MarkingCouponDataReportVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/MarkingCouponDataReportVo.java @@ -11,6 +11,36 @@ public class MarkingCouponDataReportVo { //券核销人数 verifyUserCount private String createTime; + public Long getCouponId() { + return couponId; + } + + public void setCouponId(Long couponId) { + this.couponId = couponId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + private Long couponId; //券id + + private String title; //券名称 + + private String type; //券类型 + public String getCreateTime() { return createTime; } diff --git a/mallinkService/src/main/java/com/simple/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MarkingDataReportServiceImpl.java index b9821ceab..ef10a7758 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MarkingDataReportServiceImpl.java @@ -3,16 +3,16 @@ package com.simple.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.domain.dto.MarkingCouponDataReportDto; +import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxUserVisit; import com.simple.domain.vo.MarkingCouponDataReportVo; import com.simple.domain.vo.MarkingSceneDataReportVo; import com.simple.domain.vo.MarkingSceneDataVo; import com.simple.domain.vo.TouchUsersReportVo; -import com.simple.mapper.WxCarCmdLogMapper; -import com.simple.mapper.WxCouponActionLogMapper; -import com.simple.mapper.WxCouponOrderMapper; -import com.simple.mapper.WxUserVisitMapper; +import com.simple.enums.EnumCouponType; +import com.simple.mapper.*; import com.simple.service.MarkingDataReportService; +import com.simple.service.WxCouponService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,6 +35,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { private WxCarCmdLogMapper wxCarCmdLogMapper; @Autowired private WxUserVisitMapper wxUserVisitMapper; + @Autowired + private WxCouponMapper wxCouponMapper; //取本月第一天 private Date getFirstDayOfMonth() { @@ -195,6 +197,23 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params.put("endTime", convertDateAndAdd(convertDate(markingCouponDataReportDto.getEndTime()), 1)); PageHelper.startPage(pageIndex, pageSize); List couponDatalist = wxCouponOrderMapper.couponDataList(params); + if(couponDatalist.isEmpty()){ + return new PageInfo<>(couponDatalist); + } + List couponIds = couponDatalist.stream().map(p->p.getCouponId()).distinct().collect(Collectors.toList()); + WxCoupon wxCoupon = new WxCoupon(); + wxCoupon.setTenantId(tenantId); + wxCoupon.setIds(couponIds); + List wxCoupons = wxCouponMapper.findList(wxCoupon); + Map map = wxCoupons.stream().collect(Collectors.toMap(WxCoupon::getId, p -> p)); + for (MarkingCouponDataReportVo temp:couponDatalist) { + if(map.get(temp.getCouponId())!=null){ + temp.setTitle(map.get(temp.getCouponId()).getTitle()); + String typeName = EnumCouponType.getEnum(map.get(temp.getCouponId()).getType()).getMessage(); + temp.setType(typeName); + } + } + return new PageInfo<>(couponDatalist); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 56e614bbf..2d48752ff 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -383,11 +383,11 @@