From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/vo/ApiShopVo.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiShopVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiShopVo.java
index 33b5ee5..7fe24e7 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/ApiShopVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiShopVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -14,6 +15,8 @@
@Data
@ApiModel(value = "ApiShopVo", description = "店铺列表")
public class ApiShopVo {
+
+ private Long id;
@ApiModelProperty(value = "店铺名称")
private String shopName;
@@ -33,6 +36,26 @@
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
+ private String province;
+
+ private String city;
+
+ private String county;
+
+ private String address;
+
+ public String getAddress() {
+ if (StrUtil.isBlank(city) || StrUtil.isBlank(province) || StrUtil.isBlank(county)) {
+ return null;
+ }
+
+ if (city.equals(province)) {
+ return province + county + shopAddress;
+ } else {
+ return province + city + county + shopAddress;
+ }
+ }
+
@ApiModelProperty(value = "距离")
private BigDecimal distance;
}
--
Gitblit v1.9.1