From 22f1863fc47c1993c1309d155f195bfb87727e23 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 19 Sep 2019 10:17:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=8D=A1=E5=88=B8=E6=98=AF=E5=90=A6=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxCoupon.java | 6 +++- .../enums/EnumCouponPasswordSupport.java | 36 +++++++++++++++++++ .../main/resources/mapper/WxCouponMapper.xml | 1 + 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumCouponPasswordSupport.java 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 45cb95f98..de96f12b7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -140,6 +140,9 @@ public class WxCoupon extends BaseEntity { private Integer approvalType; + @io.swagger.annotations.ApiModelProperty(value="卡密是否支持(0:不支持,1支持)",name="passwordSupport") + private Integer passwordSupport; + @Transient private String merchantParams; @@ -162,7 +165,8 @@ public class WxCoupon extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="投放渠道id",name="couponChannelId") private Long couponChannelId; - //营销分析 + @Transient + @io.swagger.annotations.ApiModelProperty(value="营销分析",name="wxCouponStatisVo") private WxCouponStatisVo wxCouponStatisVo; @io.swagger.annotations.ApiModelProperty(value="投放审批状态",name="putApplyStatus") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponPasswordSupport.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponPasswordSupport.java new file mode 100644 index 000000000..7024ae8cf --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponPasswordSupport.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumCouponPasswordSupport { + + NOT_SUPPORT(0, "不支持"), + SUPPORTED(1, "支持"), + ; + + public static EnumCouponPasswordSupport getEnum(Integer code) { + for (EnumCouponPasswordSupport value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumCouponPasswordSupport(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 4eddf76f7..2a192f5f6 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -43,6 +43,7 @@ +