From 5b8c977f3e2f65ae21744f0da188ffe032aee567 Mon Sep 17 00:00:00 2001 From: huangyw <1207046171@qq.com> Date: Wed, 4 Sep 2024 07:57:31 +0800 Subject: [PATCH] =?UTF-8?q?release:=20=E9=97=A8=E5=BA=97=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=AE=80=E4=BB=8B=E5=92=8Ccode=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/luoo/user/pojo/Store.java | 9 +++++++++ .../java/com/luoo/user/service/StoreService.java | 10 +++++++--- .../main/java/com/luoo/user/vo/store/StoreAppVO.java | 12 +++++++++++- .../main/java/com/luoo/user/vo/store/StorePCVO.java | 10 +++++++++- luoo_user/src/main/resources/sql/20240904.sql | 6 ++++++ 5 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 luoo_user/src/main/resources/sql/20240904.sql diff --git a/luoo_user/src/main/java/com/luoo/user/pojo/Store.java b/luoo_user/src/main/java/com/luoo/user/pojo/Store.java index 4e7f95b..641566b 100644 --- a/luoo_user/src/main/java/com/luoo/user/pojo/Store.java +++ b/luoo_user/src/main/java/com/luoo/user/pojo/Store.java @@ -83,4 +83,13 @@ public class Store extends JPABasePojo { @Column(name = "visit_count") @ApiModelProperty(value = "门店访问量") private Integer visitCount; + + @Column(name = "introduction") + @ApiModelProperty(value = "简介") + private String introduction; + + @Column(name = "code") + @ApiModelProperty(value = "编码") + private String code; + } \ No newline at end of file diff --git a/luoo_user/src/main/java/com/luoo/user/service/StoreService.java b/luoo_user/src/main/java/com/luoo/user/service/StoreService.java index 3d7c7bf..35b7814 100644 --- a/luoo_user/src/main/java/com/luoo/user/service/StoreService.java +++ b/luoo_user/src/main/java/com/luoo/user/service/StoreService.java @@ -118,11 +118,13 @@ public class StoreService { qStore.openingHours, qStore.background, qStore.description, - qStore.visitCount + qStore.visitCount, + qStore.introduction, + qStore.code )).from(qStore) .where( (qStore.id.eq(id)) - .and(qStore.status.eq(StoreEnums.STORE_STATUS_COOPERATION.getCode()))) + .and(qStore.status.eq(StoreEnums.STORE_STATUS_COOPERATION.getCode()))) .fetchOne(); } @@ -154,7 +156,9 @@ public class StoreService { qStore.description, qStore.createTime, qStore.status, - qStore.visitCount + qStore.visitCount, + qStore.introduction, + qStore.code )).from(qStore) .where(booleanBuilder) .orderBy(qStore.createTime.desc()) diff --git a/luoo_user/src/main/java/com/luoo/user/vo/store/StoreAppVO.java b/luoo_user/src/main/java/com/luoo/user/vo/store/StoreAppVO.java index 14b6b11..940d345 100644 --- a/luoo_user/src/main/java/com/luoo/user/vo/store/StoreAppVO.java +++ b/luoo_user/src/main/java/com/luoo/user/vo/store/StoreAppVO.java @@ -72,10 +72,16 @@ public class StoreAppVO implements Serializable { @ApiModelProperty(value = "门店访问量") private Integer visitCount; + @ApiModelProperty(value = "简介") + private String introduction; + + @ApiModelProperty(value = "编码") + private String code; + public StoreAppVO() { } - public StoreAppVO(String id, String name, Integer regionId, String address, String lng, String lat, String contact, String phone, String tel, String openingHours, String background, String description, Integer visitCount) { + public StoreAppVO(String id, String name, Integer regionId, String address, String lng, String lat, String contact, String phone, String tel, String openingHours, String background, String description, Region region, Double distance, Integer visitCount, String introduction, String code) { this.id = id; this.name = name; this.regionId = regionId; @@ -88,6 +94,10 @@ public class StoreAppVO implements Serializable { this.openingHours = openingHours; this.background = background; this.description = description; + this.region = region; + this.distance = distance; this.visitCount = visitCount; + this.introduction = introduction; + this.code = code; } } \ No newline at end of file diff --git a/luoo_user/src/main/java/com/luoo/user/vo/store/StorePCVO.java b/luoo_user/src/main/java/com/luoo/user/vo/store/StorePCVO.java index 8a24a1c..790d3c3 100644 --- a/luoo_user/src/main/java/com/luoo/user/vo/store/StorePCVO.java +++ b/luoo_user/src/main/java/com/luoo/user/vo/store/StorePCVO.java @@ -77,13 +77,19 @@ public class StorePCVO implements Serializable { @ApiModelProperty(value = "昵称") String contactNickName; + @ApiModelProperty(value = "简介") + private String introduction; + + @ApiModelProperty(value = "编码") + private String code; + @Transient Region region; public StorePCVO() { } - public StorePCVO(String id, String name, Integer regionId, String address, String lng, String lat, String contact, String phone, String tel, String openingHours, String background, String description, LocalDateTime createTime, Integer status, Integer visitCount) { + public StorePCVO(String id, String name, Integer regionId, String address, String lng, String lat, String contact, String phone, String tel, String openingHours, String background, String description, LocalDateTime createTime, Integer status, Integer visitCount, String introduction, String code) { this.id = id; this.name = name; this.regionId = regionId; @@ -99,5 +105,7 @@ public class StorePCVO implements Serializable { this.createTime = createTime; this.status = status; this.visitCount = visitCount; + this.introduction = introduction; + this.code = code; } } \ No newline at end of file diff --git a/luoo_user/src/main/resources/sql/20240904.sql b/luoo_user/src/main/resources/sql/20240904.sql new file mode 100644 index 0000000..e9e2d28 --- /dev/null +++ b/luoo_user/src/main/resources/sql/20240904.sql @@ -0,0 +1,6 @@ +alter table tb_store + add introduction varchar(500) null comment '简介'; + +alter table tb_store + add code varchar(20) null comment '编码'; +