| @@ -140,6 +140,9 @@ public class WxCoupon extends BaseEntity { | |||||
| private Integer approvalType; | private Integer approvalType; | ||||
| @io.swagger.annotations.ApiModelProperty(value="卡密是否支持(0:不支持,1支持)",name="passwordSupport") | |||||
| private Integer passwordSupport; | |||||
| @Transient | @Transient | ||||
| private String merchantParams; | private String merchantParams; | ||||
| @@ -162,7 +165,8 @@ public class WxCoupon extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="投放渠道id",name="couponChannelId") | @io.swagger.annotations.ApiModelProperty(value="投放渠道id",name="couponChannelId") | ||||
| private Long couponChannelId; | private Long couponChannelId; | ||||
| //营销分析 | |||||
| @Transient | |||||
| @io.swagger.annotations.ApiModelProperty(value="营销分析",name="wxCouponStatisVo") | |||||
| private WxCouponStatisVo wxCouponStatisVo; | private WxCouponStatisVo wxCouponStatisVo; | ||||
| @io.swagger.annotations.ApiModelProperty(value="投放审批状态",name="putApplyStatus") | @io.swagger.annotations.ApiModelProperty(value="投放审批状态",name="putApplyStatus") | ||||
| @@ -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; | |||||
| } | |||||
| } | |||||
| @@ -43,6 +43,7 @@ | |||||
| <result column="cancle_apply_status" property="cancleApplyStatus"/> | <result column="cancle_apply_status" property="cancleApplyStatus"/> | ||||
| <result column="conditions" jdbcType="VARCHAR" property="conditions"/> | <result column="conditions" jdbcType="VARCHAR" property="conditions"/> | ||||
| <result column="approval_type" property="approvalType"/> | <result column="approval_type" property="approvalType"/> | ||||
| <result column="password_support" property="passwordSupport"/> | |||||
| </resultMap> | </resultMap> | ||||
| <resultMap id="statisMap" type="com.iformall.domain.vo.WxCouponStatisVo"> | <resultMap id="statisMap" type="com.iformall.domain.vo.WxCouponStatisVo"> | ||||
| <id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||