From b8f22b5ca9d2ba798ff569cf1e92af9232ebbdd3 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 27 Sep 2018 16:13:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=8F=91=E5=88=B8=E7=9A=84=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/enums/EnumCouponSendSendType.java | 5 +++-- .../iformall/service/impl/MarkingDataReportServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) 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);