From 5e7c09f0e6dd9517ad6d2ce6e158f04043eace8e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 16 Jan 2019 14:59:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=82=A8=E5=80=BC=E5=8D=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=94=B17=E5=8F=98=E4=B8=BA100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxCoupon.java | 4 ++-- .../src/main/java/com/iformall/enums/EnumCouponType.java | 2 +- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 2 +- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) 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 881b55e28..2518186a1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -81,8 +81,8 @@ public class WxCoupon implements Serializable { /**副标题**/ @io.swagger.annotations.ApiModelProperty(value="副标题",name="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; /**使用条件金额(适用于类型1,2,3,4)**/ @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java index 6e6fb08ba..8a76dbc34 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java @@ -14,7 +14,7 @@ public enum EnumCouponType { COUPON_TINGCHE(5, "停车券"), COUPON_MULTIMCH(6, "通用券"), COUPON_PRESS(8, "砍价券"), - COUPON_GROUP(9, "团购券"), + // COUPON_GROUP(9, "团购券"), CARD_MULTIMCH(100, "消费卡"), ; diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 0c63828b8..0e912f43f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -176,7 +176,7 @@ - where `type` = 7 + where `type` = 100 and `id` = #{id} diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 208002958..501e94ffa 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -707,7 +707,7 @@ inner join wx_coupon c on co.coupon_id = c.id inner join wx_card_info a on co.id=a.id where 1=1 - and co.coupon_type = 7 + and co.coupon_type = 100 and co.tenant_id = #{tenantId}