From e00520ae4077cb553cd13f706a422277781642ff Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 20 Sep 2019 15:04:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E5=8F=91=E5=8D=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=8F=91=E9=80=81=E8=AF=A6=E6=83=85]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201909170500__G_COUPON_PASSWORD.sql | 2 ++ .../java/com/iformall/domain/po/WxCouponPassword.java | 3 +++ .../src/main/resources/mapper/WxCouponPasswordMapper.xml | 9 ++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201909170500__G_COUPON_PASSWORD.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909170500__G_COUPON_PASSWORD.sql b/mallinkAdmin/src/main/resources/db/migration/V201909170500__G_COUPON_PASSWORD.sql new file mode 100644 index 000000000..d21cd7a56 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201909170500__G_COUPON_PASSWORD.sql @@ -0,0 +1,2 @@ +alter table wx_coupon_password +add column present_id bigint(20) default 0 not null comment '发放ID'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java index d5f84a35d..f7f52952d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java @@ -46,6 +46,9 @@ public class WxCouponPassword extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="过期时间",name="expireDate") private Date expireDate; + @io.swagger.annotations.ApiModelProperty(value = "发放ID", name = "presentId") + private Long presentId; + @Transient private String statusStr; diff --git a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index 270deaded..b512f3a55 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -13,10 +13,12 @@ + + - `id`,`tenant_id`,`coupon_id`,`coupon_short`,`password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date` + `id`,`tenant_id`,`coupon_id`,`coupon_short`,`password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date`,`present_id` @@ -54,6 +56,11 @@ and `expire_date` > #{expireDate} + + + and `present_id` > #{presentId} + + and id in