| @@ -69,8 +69,8 @@ public class WxCoupon implements Serializable { | |||||
| /**租户ID**/ | /**租户ID**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡,8.砍价券,9.团购券)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡,8.砍价券,9.团购券)",name="type") | |||||
| /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)",name="type") | |||||
| private Integer type; | private Integer type; | ||||
| /**封面图**/ | /**封面图**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | ||||
| @@ -47,8 +47,8 @@ public class WxCouponOrder implements Serializable { | |||||
| /**卡券ID**/ | /**卡券ID**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "卡券ID", name = "couponId") | @io.swagger.annotations.ApiModelProperty(value = "卡券ID", name = "couponId") | ||||
| private Long couponId; | private Long couponId; | ||||
| /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡) */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡)", name = "couponType") | |||||
| /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡) */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)", name = "couponType") | |||||
| private Integer couponType; | private Integer couponType; | ||||
| /*c端用户id**/ | /*c端用户id**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "c端用户id", name = "cUserId") | @io.swagger.annotations.ApiModelProperty(value = "c端用户id", name = "cUserId") | ||||
| @@ -40,8 +40,8 @@ public class WxMerchantSubsidy implements Serializable { | |||||
| /**券包ID/存储卡ID*/ | /**券包ID/存储卡ID*/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="券包ID/存储卡ID",name="couponOrderId") | @io.swagger.annotations.ApiModelProperty(value="券包ID/存储卡ID",name="couponOrderId") | ||||
| private Long couponOrderId; | private Long couponOrderId; | ||||
| /**券包类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡)*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="券包类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡)",name="couponType") | |||||
| /**券包类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="券包类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)",name="couponType") | |||||
| private Integer couponType; | private Integer couponType; | ||||
| /**订单金额*/ | /**订单金额*/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="订单金额",name="orderPayment") | @io.swagger.annotations.ApiModelProperty(value="订单金额",name="orderPayment") | ||||
| @@ -18,8 +18,8 @@ public class WxOrderCouponPressVo extends WxOrder { | |||||
| /**券类型信息 */ | /**券类型信息 */ | ||||
| /**商户id**/ | /**商户id**/ | ||||
| /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡,8.砍价券,9.团购券)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡,8.砍价券,9.团购券)",name="couponType") | |||||
| /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)",name="couponType") | |||||
| private Integer couponType; | private Integer couponType; | ||||
| /**封面图**/ | /**封面图**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | ||||
| @@ -69,8 +69,8 @@ public class WxOrderCouponVo { | |||||
| /* 券类型信息 */ | /* 券类型信息 */ | ||||
| /*商户id**/ | /*商户id**/ | ||||
| /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡,8.砍价券,9.团购券)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡,8.砍价券,9.团购券)",name="type") | |||||
| /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)",name="type") | |||||
| private Integer type; | private Integer type; | ||||
| /*封面图**/ | /*封面图**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | ||||
| @@ -5,16 +5,18 @@ package com.iformall.enums; | |||||
| */ | */ | ||||
| public enum EnumCouponType { | public enum EnumCouponType { | ||||
| // 1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.通用券,7.消费卡 | |||||
| // 1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.通用券, 8.砍价券 | |||||
| // 100.消费卡 | |||||
| COUPON_MANJIAN(1, "满减券"), | COUPON_MANJIAN(1, "满减券"), | ||||
| COUPON_DAIJIN(2, "代金券"), | COUPON_DAIJIN(2, "代金券"), | ||||
| COUPON_TUANGOU(3, "团购券"), | COUPON_TUANGOU(3, "团购券"), | ||||
| COUPON_LIPIN(4, "礼品券"), | COUPON_LIPIN(4, "礼品券"), | ||||
| COUPON_TINGCHE(5, "停车券"), | COUPON_TINGCHE(5, "停车券"), | ||||
| COUPON_MULTIMCH(6, "通用券"), | COUPON_MULTIMCH(6, "通用券"), | ||||
| CARD_MULTIMCH(7, "消费卡"), | |||||
| COUPON_PRESS(8, "砍价券"), | COUPON_PRESS(8, "砍价券"), | ||||
| COUPON_GROUP(9, "团购券"), | COUPON_GROUP(9, "团购券"), | ||||
| CARD_MULTIMCH(100, "消费卡"), | |||||
| ; | ; | ||||
| public static EnumCouponType getEnum(Integer code) { | public static EnumCouponType getEnum(Integer code) { | ||||
| @@ -568,8 +568,7 @@ | |||||
| where 1=1 | where 1=1 | ||||
| and co.coupon_id = c.id | and co.coupon_id = c.id | ||||
| and co.coupon_type != 5 | and co.coupon_type != 5 | ||||
| and co.coupon_type != 7 | |||||
| and co.coupon_type != 9 | |||||
| and co.coupon_type != 100 | |||||
| <if test="cUserId != null"> | <if test="cUserId != null"> | ||||
| and co.c_user_id = #{cUserId} | and co.c_user_id = #{cUserId} | ||||
| </if> | </if> | ||||
| @@ -219,7 +219,7 @@ | |||||
| from wx_coupon c,wx_order o | from wx_coupon c,wx_order o | ||||
| left join wx_coupon_order co on co.order_id = o.id | left join wx_coupon_order co on co.order_id = o.id | ||||
| left join wx_coupon_action_log cal on cal.coupon_order_id = co.id | left join wx_coupon_action_log cal on cal.coupon_order_id = co.id | ||||
| where o.product_id = c.id and c.type != 7 | |||||
| where o.product_id = c.id and c.type != 100 | |||||
| <if test="cUserId != null"> | <if test="cUserId != null"> | ||||
| and o.c_user_id = #{cUserId} | and o.c_user_id = #{cUserId} | ||||
| </if> | </if> | ||||