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 @@
+