| @@ -81,8 +81,8 @@ public class WxCoupon implements Serializable { | |||||
| /**副标题**/ | /**副标题**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | ||||
| private String subTitle; | private String subTitle; | ||||
| /**售价(适用于类型2,3,4,5, 6, 7, 8, 9)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5, 6, 7, 8, 9)",name="salePrice") | |||||
| /**售价(适用于类型2,3,4,5, 6, 8, 100)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5, 6, 8, 9, 100)",name="salePrice") | |||||
| private Integer salePrice; | private Integer salePrice; | ||||
| /**使用条件金额(适用于类型1,2,3,4)**/ | /**使用条件金额(适用于类型1,2,3,4)**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") | @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") | ||||
| @@ -14,7 +14,7 @@ public enum EnumCouponType { | |||||
| COUPON_TINGCHE(5, "停车券"), | COUPON_TINGCHE(5, "停车券"), | ||||
| COUPON_MULTIMCH(6, "通用券"), | COUPON_MULTIMCH(6, "通用券"), | ||||
| COUPON_PRESS(8, "砍价券"), | COUPON_PRESS(8, "砍价券"), | ||||
| COUPON_GROUP(9, "团购券"), | |||||
| // COUPON_GROUP(9, "团购券"), | |||||
| CARD_MULTIMCH(100, "消费卡"), | CARD_MULTIMCH(100, "消费卡"), | ||||
| ; | ; | ||||
| @@ -176,7 +176,7 @@ | |||||
| </select> | </select> | ||||
| <sql id="dynamicWhereConditionsForCard"> | <sql id="dynamicWhereConditionsForCard"> | ||||
| where `type` = 7 | |||||
| where `type` = 100 | |||||
| <if test=" null != id "> | <if test=" null != id "> | ||||
| and `id` = #{id} | and `id` = #{id} | ||||
| @@ -707,7 +707,7 @@ | |||||
| inner join wx_coupon c on co.coupon_id = c.id | inner join wx_coupon c on co.coupon_id = c.id | ||||
| inner join wx_card_info a on co.id=a.id | inner join wx_card_info a on co.id=a.id | ||||
| where 1=1 | where 1=1 | ||||
| and co.coupon_type = 7 | |||||
| and co.coupon_type = 100 | |||||
| <if test="tenantId != null"> | <if test="tenantId != null"> | ||||
| and co.tenant_id = #{tenantId} | and co.tenant_id = #{tenantId} | ||||
| </if> | </if> | ||||