From 7925a1d50ebe58048bd1a0bcbfc224745100f1e5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 18 Sep 2019 13:42:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E5=9C=BA=E4=BF=A1=E6=81=AF][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AE=8C=E5=96=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=8AC=E7=AB=AF=E5=B1=95=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201909181335__G_MALL_CHANGE.sql | 7 +++++++ .../java/com/iformall/domain/po/WxMall.java | 18 +++++++++++++++--- .../src/main/resources/mapper/WxMallMapper.xml | 9 ++++++++- 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201909181335__G_MALL_CHANGE.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909181335__G_MALL_CHANGE.sql b/mallinkAdmin/src/main/resources/db/migration/V201909181335__G_MALL_CHANGE.sql new file mode 100644 index 000000000..48dd9611a --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201909181335__G_MALL_CHANGE.sql @@ -0,0 +1,7 @@ +alter table wx_mall +add column parking_space varchar(20) DEFAULT 0 not null comment '停车位', +add column business_hours json not null comment '营业时间', +add column introduction varchar(255) DEFAULT '' not null comment '简介', +add column img varchar(255) DEFAULT '' not null comment '图片'; + +update wx_mall set business_hours = JSON_ARRAY(); \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index f1aa4d5e0..b15d0ca70 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -69,8 +69,8 @@ public class WxMall extends BaseEntity { private Integer saleType; @io.swagger.annotations.ApiModelProperty(value="启用开始时间",name="validStart") private Date validStart; - @io.swagger.annotations.ApiModelProperty(value="启用结束时间",name="validEnd") - private Date validEnd; + @io.swagger.annotations.ApiModelProperty(value = "启用结束时间", name = "validEnd") + private Date validEnd; @TableField(exist = false) protected List buildings; @@ -92,5 +92,17 @@ public class WxMall extends BaseEntity { return true; } - + + @io.swagger.annotations.ApiModelProperty(value = "停车位", name = "parkingSpace") + private String parkingSpace; + + @io.swagger.annotations.ApiModelProperty(value = "营业时间", name = "businessHours") + private String businessHours; + + @io.swagger.annotations.ApiModelProperty(value = "简介", name = "introduction") + private String introduction; + + @io.swagger.annotations.ApiModelProperty(value = "图片", name = "img") + private String img; + } diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index f1aa37087..24fefd546 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -26,6 +26,13 @@ + + + + + + + @@ -33,7 +40,7 @@ `total_area`,`operating_area`,`park_area`,`park_place_number`,`service_phone`, `img_url`,`img_url_h`, `weap_note`, `img_qrcode_weapp`, `img_qrcode_wemp`, `weapp_share_title`,`weapp_share_cover_img`, `pos_qrcode_rule`, - `sale_type`, `valid_start`, `valid_end` + `sale_type`, `valid_start`, `valid_end`,`parking_space`,`business_hours`,`introduction`,`img`