From 2397f0b516986f2681ea933e6214c41464fbc662 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 21 Apr 2022 10:43:53 +0800 Subject: [PATCH] //update --- .../src/main/java/com/iformall/domain/po/WxMerchant.java | 4 ++++ .../src/main/java/com/iformall/domain/vo/WxMerchantVo.java | 1 + .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 2 ++ 3 files changed, 7 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index d4f872a34..9dbe1be05 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -342,6 +342,10 @@ public class WxMerchant extends TenantEntity { @TableField(exist = false) private Long floor; + @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") + @TableField(exist = false) + private String addr; + @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") @TableField(exist = false) private Float longitude; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index 699a2d550..0a230f5fd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -126,6 +126,7 @@ public class WxMerchantVo extends TenantEntity { this.actionDesc = m.getActionDesc(); this.linkLinePhone = m.getLinkLinePhone(); this.topTime = m.getTopTime(); + this.addr = m.getAddr(); this.longitude = m.getLongitude(); this.latitude = m.getLatitude(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 56913a1ec..dfbd77dba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1250,6 +1250,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (null != m) { TtMerchantPoi poi = poiMap.get(m.getId()); if(null != poi){ + m.setAddr(poi.getAddress()); m.setLongitude(poi.getLongitude()); m.setLatitude(poi.getLatitude()); } @@ -1316,6 +1317,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (hasShop && null != merchantShopVoList) { vo.setShopVoList(merchantShopVoList.get(vo.getId())); } + vo.setAddr(m.getAddr()); vo.setLongitude(m.getLongitude()); vo.setLatitude(m.getLatitude()); return vo;