@@ -16,6 +16,7 @@ import com.iformall.exception.MallinkException;
import com.iformall.mapper.*;
import com.iformall.service.ExcelService;
import com.iformall.service.MarkingDataReportService;
import com.iformall.service.WxCouponActionLogService;
import com.iformall.service.WxCouponOrderService;
import com.iformall.utils.DateUtils;
import org.apache.commons.collections.map.HashedMap;
@@ -44,7 +45,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
@Autowired
private WxCouponOrderMapper wxCouponOrderMapper;
@Autowired
private WxCouponActionLogMapper wxCouponActionLogMapper ;
private WxCouponActionLogService wxCouponActionLogService ;
@Autowired
private WxCarCmdLogMapper wxCarCmdLogMapper;
@Autowired
@@ -164,11 +165,10 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
@Override
public Map<String, Object> getSceneData(TenantEntity tenantEntity) {
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
//今日营销投放券数
int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId() , addDay(0), addDay(1));
int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId() , addDay(-1), addDay(0));
int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId() , addDay(-7), addDay(-6));
int todaySceneCount = wxCouponActionLogService.getCountByDateLimit(tenantEntity , addDay(0), addDay(1));
int yesterdayCount = wxCouponActionLogService.getCountByDateLimit(tenantEntity , addDay(-1), addDay(0));
int lastWeekCount = wxCouponActionLogService.getCountByDateLimit(tenantEntity , addDay(-7), addDay(-6));
NumberFormat nf = NumberFormat.getPercentInstance();
nf.setMinimumFractionDigits(2);//控制保留小数点后几位,2:表示保留2位小数点
@@ -180,74 +180,17 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
if (lastWeekCount != 0) {
sceneUpWeek = nf.format((todaySceneCount - lastWeekCount) / (float) lastWeekCount);
}
HashMap<String, Object> returnMap = new HashMap<>();
returnMap.put("todaySceneCount", todaySceneCount);//今日领取数
returnMap.put("yesterdayCount", yesterdayCount);//昨日领取数
returnMap.put("sceneDownDay", sceneDownDay);//比昨日下降
returnMap.put("lastWeekCount", lastWeekCount);//上周领取数
returnMap.put("sceneUpWeek", sceneUpWeek);//比上周提升
HashMap<String, Object> params = new HashMap<>();
params.put("tenantEntitys", tenantEntitys);
params.put("tenantId", tenantEntity.getTenantId());
// if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) {
// params.put("parentTenantId", tenantEntity.getParentTenantId());
// }
params.put("startTime", addDay(-30));
params.put("endTime", addDay(1));
//停车发券数 停车发券被核销数 核销发券数 核销发券被核销数
for (TenantEntity t:tenantEntitys) {
params.put("tenantId", t.getTenantId());
wxCouponActionLogMapper.updateCreateTimeMd(params);
}
List<MarkingSceneDataReportTVo> sceneList = wxCouponActionLogMapper.getSceneDataMap(params);
//处理数据
wxCouponActionLogService.updateCreateTimeMd(tenantEntity);
//停车发券被核销数
HashMap<String, Object> params1 = new HashMap<>();
params1.put("tenantEntitys", tenantEntitys);
params1.put("tenantId", tenantEntity.getTenantId());
if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) {
params1.put("parentTenantId", tenantEntity.getParentTenantId());
}
params1.put("startTime", addDay(-30));
params1.put("endTime", addDay(1));
params1.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode());//停车
List<MarkingSceneDataReportVo> list1 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params1);
Map<String, Integer> parkCountMap = list1.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount()));
//核销发券被核销数
HashMap<String, Object> params2 = new HashMap<>();
params2.put("tenantEntitys", tenantEntitys);
params2.put("tenantId", tenantEntity.getTenantId());
if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) {
params2.put("parentTenantId", tenantEntity.getParentTenantId());
}
params2.put("startTime", addDay(-30));
params2.put("endTime", addDay(1));
params2.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode());//核销
List<MarkingSceneDataReportVo> list2 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params2);
Map<String, Integer> verifyCountMap = list2.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount()));
// B端刷卡支付被核销数
HashMap<String, Object> params3 = new HashMap<>();
params3.put("tenantEntitys", tenantEntitys);
params3.put("tenantId", tenantEntity.getTenantId());
if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) {
params3.put("parentTenantId", tenantEntity.getParentTenantId());
}
params3.put("startTime", addDay(-30));
params3.put("endTime", addDay(1));
params3.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode());//B端刷卡支付
List<MarkingSceneDataReportVo> list3 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params3);
Map<String, Integer> microPayCountMap = list3.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount()));
// 购买发券被核销数
HashMap<String, Object> params4 = new HashMap<>();
params4.put("tenantEntitys", tenantEntitys);
params4.put("tenantId", tenantEntity.getTenantId());
if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) {
params4.put("parentTenantId", tenantEntity.getParentTenantId());
}
params4.put("startTime", addDay(-30));
params4.put("endTime", addDay(1));
params4.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券
List<MarkingSceneDataReportVo> list4 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params4);
Map<String, Integer> OrderCountMap = list4.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount()));
Map<String,Integer> sceneMap = wxCouponActionLogService.getSceneDataMap(tenantEntity,addDay(-30),addDay(1));
String startdate = DateUtils.getTimeBefore(30, new Date());
String enddate = DateUtils.getTimeBefore(1,new Date());
@@ -258,37 +201,14 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
for(String tj:tjList){
MarkingSceneDataReportVo msdVo = new MarkingSceneDataReportVo();
msdVo.setXTime(tj);
Optional<MarkingSceneDataReportTVo> carStop = sceneList.stream().filter(c -> c.getXTime().equals(tj) && c.getChannelType() == EnumCouponSendSendType.CAR_STOP.getCode()).findFirst();
if (!carStop.isPresent()) {
msdVo.setParkSendCount(0);
} else {
MarkingSceneDataReportTVo tvo = carStop.get();
msdVo.setParkSendCount(tvo.getCount());
}
Optional<MarkingSceneDataReportTVo> couponVerify = sceneList.stream().filter(c -> c.getXTime().equals(tj) && c.getChannelType() == EnumCouponSendSendType.COUPON_VERIFY.getCode()).findFirst();
if(!couponVerify.isPresent()) {
msdVo.setVerifySendCount(0);
} else {
MarkingSceneDataReportTVo tvo = couponVerify.get();
msdVo.setVerifySendCount(tvo.getCount());
}
Optional<MarkingSceneDataReportTVo> microPay = sceneList.stream().filter(c -> c.getXTime().equals(tj) && c.getChannelType() == EnumCouponSendSendType.B_MICROPAY.getCode()).findFirst();
if(!microPay.isPresent()) {
msdVo.setMicroPaySendCount(0);
} else {
MarkingSceneDataReportTVo tvo = microPay.get();
msdVo.setMicroPaySendCount(tvo.getCount());
}
Optional<MarkingSceneDataReportTVo> orderSend = sceneList.stream().filter(c -> c.getXTime().equals(tj) && c.getChannelType() == EnumCouponSendSendType.C_ORDER.getCode()).findFirst();
if(!orderSend.isPresent()) {
msdVo.setOrderSendCount(0);
} else {
MarkingSceneDataReportTVo tvo = orderSend.get();
msdVo.setOrderSendCount(tvo.getCount());
}
Integer count2 = sceneMap.get(tj + "_" + EnumCouponSendSendType.CAR_STOP.getCode());
msdVo.setParkSendCount(count2==null?0:count2);
Integer count3 = sceneMap.get(tj + "_" + EnumCouponSendSendType.COUPON_VERIFY.getCode());
msdVo.setVerifySendCount(count3==null?0:count3);
Integer count4 = sceneMap.get(tj + "_" + EnumCouponSendSendType.B_MICROPAY.getCode());
msdVo.setMicroPaySendCount(count4==null?0:count4);
Integer count5 = sceneMap.get(tj + "_" + EnumCouponSendSendType.C_ORDER.getCode());
msdVo.setMicroPaySendCount(count5==null?0:count5);
msdVo.setTotal(msdVo.getParkSendCount() +
msdVo.getVerifySendCount() +
@@ -298,11 +218,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
tempDatalist.add(msdVo);
}
HashMap<String, Object> returnMap = new HashMap<>();
returnMap.put("sceneDownDay", sceneDownDay);//比昨日下降
returnMap.put("sceneUpWeek", sceneUpWeek);//比上周提升
returnMap.put("todaySceneCount", todaySceneCount);//今日领取数
returnMap.put("sceneDataMap", tempDatalist);
return returnMap;
}
@@ -350,10 +265,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
@Override
public PageInfo<MarkingSceneDataVo> getSceneDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) {
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
MarkingCouponDataReportDto queryDto = new MarkingCouponDataReportDto();
org.springframework.beans.BeanUtils.copyProperties(markingCouponDataReportDto, queryDto);
queryDto.setTenantEntitys(tenantEntitys);
queryDto.updateTenantInfo(tenantEntity);
HashMap<String, Object> params = new HashMap<>();
@@ -368,142 +281,40 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
queryDto.setEndTime(convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
}
params.put("channelType", markingCouponDataReportDto.getType());
queryDto.setChannelType(markingCouponDataReportDto.getType());
//TODO 商户发券数据,下个版本需求
if(Objects.equals(markingCouponDataReportDto.getType(),EnumCouponSendSendType.MERCHANT.getCode())) {
markingCouponDataReportDto.setType(null);
}
//停车发券数 停车发券被核销数, 核销发券数 核销发券被核销数, B端刷卡支付发券数 刷卡支付发券被核销数
PageHelper.startPage(pageIndex, pageSize);
List<MarkingSceneDataVo> list;
if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())) {
queryDto.setChannelType(EnumCouponSendSendType.CAR_STOP.getCode());
list = wxCouponActionLogMapper.sceneDataList(queryDto);
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())) {
queryDto.setChannelType(EnumCouponSendSendType.B_MICROPAY.getCode());
list = wxCouponActionLogMapper.sceneDataList(queryDto);
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())){
queryDto.setChannelType(EnumCouponSendSendType.COUPON_VERIFY.getCode());
list = wxCouponActionLogMapper.sceneDataList(queryDto);
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())){
queryDto.setChannelType(EnumCouponSendSendType.C_ORDER.getCode());
list = wxCouponActionLogMapper.sceneDataList(queryDto);
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.MERCHANT.getCode())){
queryDto.setChannelType(markingCouponDataReportDto.getType());
list = wxCouponActionLogMapper.sceneDataList(queryDto);
}else{
PageHelper.clearPage();
list = new ArrayList<>();
}
Map<String, Integer> countMap = new HashMap<>();
params.clear();
params.put("tenantEntitys",tenantEntitys);
params.put("tenantId", tenantEntity.getTenantId());
if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) {
params.put("parentTenantId", tenantEntity.getParentTenantId());
}
if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车
//停车发券被核销数
if (markingCouponDataReportDto.getStartTime() != null)
params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
if (markingCouponDataReportDto.getEndTime() != null)
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
params.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode());
List<MarkingSceneDataReportVo> list1 = wxCouponActionLogMapper.sceneDataJoinCouponOrderList(params);
countMap = list1.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount()));
} else if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())){ // B端刷卡支付
//B端刷卡发券 被核销数
if (markingCouponDataReportDto.getStartTime() != null)
params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
if (markingCouponDataReportDto.getEndTime() != null)
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
params.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode());
List<MarkingSceneDataReportVo> list2 = wxCouponActionLogMapper.sceneDataJoinCouponOrderList(params);
countMap = list2.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount()));
} else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())){
//核销发券被核销数
if (markingCouponDataReportDto.getStartTime() != null)
params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
if (markingCouponDataReportDto.getEndTime() != null)
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
params.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode());
List<MarkingSceneDataReportVo> list3 = wxCouponActionLogMapper.sceneDataJoinCouponOrderList(params);
countMap = list3.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount()));
} else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())){
//购买发数
if (markingCouponDataReportDto.getStartTime() != null)
params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
if (markingCouponDataReportDto.getEndTime() != null)
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
params.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());
List<MarkingSceneDataReportVo> list4 = wxCouponActionLogMapper.sceneDataJoinCouponOrderList(params);
countMap = list4.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount()));
} else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.MERCHANT.getCode())){
//购买发数
if (markingCouponDataReportDto.getStartTime() != null)
params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
if (markingCouponDataReportDto.getEndTime() != null)
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
params.put("channelType", markingCouponDataReportDto.getType());
List<MarkingSceneDataReportVo> list5 = wxCouponActionLogMapper.sceneDataJoinCouponOrderList(params);
countMap = list5.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount()));
}
List<MarkingSceneDataVo> list = wxCouponActionLogService.sceneDataList(queryDto);
List<MarkingSceneDataReportVo> list1 = wxCouponActionLogService.sceneDataJoinCouponOrderList(params);
Map<String, Integer> countMap = list1.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount()));
Map<String, Integer> triggerCountMap = new HashMap<>();
params.clear();
params.put("tenantEntitys",tenantEntitys);
params.put("tenantId", tenantEntity.getTenantId());
if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) {
params.put("parentTenantId", tenantEntity.getParentTenantId());
}
if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车
//获取车辆进场数
if (markingCouponDataReportDto.getStartTime() != null)
params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
if (markingCouponDataReportDto.getEndTime() != null)
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode());
params.put("cmdTypes", EnumCarCmd.getCarIn());
List<MarkingSceneDataVo> markingSceneDataVos = wxCarCmdLogMapper.queryForSceneRepotyHistoryCar(params);
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount()));
} else if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())){ // B端刷卡支付发券
//获取B端刷卡数
if (markingCouponDataReportDto.getStartTime() != null)
params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
if (markingCouponDataReportDto.getEndTime() != null)
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
params.put("type", EnumOrderType.MICROPAY.getCode());
List<MarkingSceneDataVo> markingSceneDataVos = wxOrderMapper.queryForSceneRepotyHistory(params);
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount()));
} else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())) {
//获取核销数
if (markingCouponDataReportDto.getStartTime() != null)
params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
if (markingCouponDataReportDto.getEndTime() != null)
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
List<MarkingSceneDataVo> markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyHistoryVerified(params);
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount()));
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())) {
//购买发券数
if (markingCouponDataReportDto.getStartTime() != null)
params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
if (markingCouponDataReportDto.getEndTime() != null)
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
List<MarkingSceneDataVo> markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyHistoryOrdered(params);
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount()));
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.MERCHANT.getCode())) {
//购买发券数
// if (markingCouponDataReportDto.getStartTime() != null)
// params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
// if (markingCouponDataReportDto.getEndTime() != null)
// params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
// params.put("channelType", markingCouponDataReportDto.getType());
// List<MarkingSceneDataVo> markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyMechantHistoryOrdered(params);
// triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount()));
}
NumberFormat nf = NumberFormat.getPercentInstance();
nf.setMinimumFractionDigits(2);
@@ -522,10 +333,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
@Override
public Map<String, Object> getSceneDataHistory(TenantEntity tenantEntity, String startDate, String endDate) {
Map<String ,Object> result = new HashedMap();
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto();
markingCouponDataReportDto.setTenantEntitys(tenantEntitys);
markingCouponDataReportDto.updateTenantInfo(tenantEntity);
Date starttime = DateUtils.stringToDate(startDate);
@@ -538,7 +347,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
//停车发券
markingCouponDataReportDto.setChannelType(EnumCouponSendSendType.CAR_STOP.getCode());
List<MarkingSceneDataVo> carStopList = wxCouponActionLogMapper .sceneDataList(markingCouponDataReportDto);
List<MarkingSceneDataVo> carStopList = wxCouponActionLogService .sceneDataList(markingCouponDataReportDto);
Map<String, Integer> countMap = carStopList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getSendCount()));
for (String date:days) {
historyMap.put(date.substring(5,date.length()).replace("-","/"),"0");
@@ -551,7 +360,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
//核销发券
markingCouponDataReportDto.setChannelType(EnumCouponSendSendType.COUPON_VERIFY.getCode());
List<MarkingSceneDataVo> couponVerifyList = wxCouponActionLogMapper .sceneDataList(markingCouponDataReportDto);
List<MarkingSceneDataVo> couponVerifyList = wxCouponActionLogService .sceneDataList(markingCouponDataReportDto);
countMap = couponVerifyList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getSendCount()));
historyMap = new TreeMap<>();
for (String date:days) {
@@ -565,7 +374,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
//交易发券
markingCouponDataReportDto.setChannelType(EnumCouponSendSendType.C_ORDER.getCode());
List<MarkingSceneDataVo> orderList = wxCouponActionLogMapper .sceneDataList(markingCouponDataReportDto);
List<MarkingSceneDataVo> orderList = wxCouponActionLogService .sceneDataList(markingCouponDataReportDto);
countMap = orderList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getSendCount()));
historyMap = new TreeMap<>();
for (String date:days) {
@@ -579,7 +388,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
//收银台发券
markingCouponDataReportDto.setChannelType(EnumCouponSendSendType.B_MICROPAY.getCode());
List<MarkingSceneDataVo> micropayList = wxCouponActionLogMapper .sceneDataList(markingCouponDataReportDto);
List<MarkingSceneDataVo> micropayList = wxCouponActionLogService .sceneDataList(markingCouponDataReportDto);
countMap = micropayList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getSendCount()));
historyMap = new TreeMap<>();
for (String date:days) {
@@ -593,7 +402,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
//商户发券
markingCouponDataReportDto.setChannelType(EnumCouponSendSendType.MERCHANT.getCode());
List<MarkingSceneDataVo> merchantList = wxCouponActionLogMapper .sceneDataList(markingCouponDataReportDto);
List<MarkingSceneDataVo> merchantList = wxCouponActionLogService .sceneDataList(markingCouponDataReportDto);
countMap = merchantList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getSendCount()));
historyMap = new TreeMap<>();
for (String date:days) {