diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java index edd3de473..0fa1a5032 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java @@ -6,11 +6,12 @@ package com.iformall.enums; public enum EnumCouponSendSendType { // 2:停车发券 3:核销发券 - UNKNOWN(0, "不详(保留)"), + UNKNOWN(-1, "未知"), + INJECT(0, "精准发券"), ACTIVE(1, "主动(保留)"), CAR_STOP(2, "停车发券"), COUPON_VERIFY(3, "核销发券"), - COUPON_INJECT(4, "精准发券") + ; public static EnumCouponSendSendType getEnum(Integer code) { 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 9bbe4bda0..f000c53e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -241,7 +241,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { for (MarkingSceneDataReportVo temp: templist) { MarkingSceneDataVo vo = new MarkingSceneDataVo(); vo.setxTime(temp.getxTime()); - if(markingCouponDataReportDto.getType()==1) { + if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())) { vo.setSendCount(temp.getParkSendCount()); }else{ vo.setSendCount(temp.getVerifySendCount()); @@ -251,7 +251,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { Map countMap = new HashMap<>(); - if(markingCouponDataReportDto.getType()==1){ //停车 + if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 //停车发券被核销数 params.clear(); params.put("tenantId", tenantId); @@ -277,7 +277,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { Map triggerCountMap = new HashMap<>(); - if(markingCouponDataReportDto.getType()==1) { //停车 + if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 //获取车辆进场数 params.clear(); params.put("tenantId", tenantId);