From 05c40a68b5664c5ed41dbaa57ba30f0c73757b26 Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Tue, 25 Apr 2023 11:10:48 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/mall/vo/ApiShopVo.java | 21 +++++++++++++++++++++ 1 files changed, 21 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..217610a 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; @@ -33,6 +34,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