| @@ -342,6 +342,10 @@ public class WxMerchant extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Long floor; | private Long floor; | ||||
| @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") | |||||
| @TableField(exist = false) | |||||
| private String addr; | |||||
| @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") | @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Float longitude; | private Float longitude; | ||||
| @@ -126,6 +126,7 @@ public class WxMerchantVo extends TenantEntity { | |||||
| this.actionDesc = m.getActionDesc(); | this.actionDesc = m.getActionDesc(); | ||||
| this.linkLinePhone = m.getLinkLinePhone(); | this.linkLinePhone = m.getLinkLinePhone(); | ||||
| this.topTime = m.getTopTime(); | this.topTime = m.getTopTime(); | ||||
| this.addr = m.getAddr(); | |||||
| this.longitude = m.getLongitude(); | this.longitude = m.getLongitude(); | ||||
| this.latitude = m.getLatitude(); | this.latitude = m.getLatitude(); | ||||
| } | } | ||||
| @@ -1250,6 +1250,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| if (null != m) { | if (null != m) { | ||||
| TtMerchantPoi poi = poiMap.get(m.getId()); | TtMerchantPoi poi = poiMap.get(m.getId()); | ||||
| if(null != poi){ | if(null != poi){ | ||||
| m.setAddr(poi.getAddress()); | |||||
| m.setLongitude(poi.getLongitude()); | m.setLongitude(poi.getLongitude()); | ||||
| m.setLatitude(poi.getLatitude()); | m.setLatitude(poi.getLatitude()); | ||||
| } | } | ||||
| @@ -1316,6 +1317,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| if (hasShop && null != merchantShopVoList) { | if (hasShop && null != merchantShopVoList) { | ||||
| vo.setShopVoList(merchantShopVoList.get(vo.getId())); | vo.setShopVoList(merchantShopVoList.get(vo.getId())); | ||||
| } | } | ||||
| vo.setAddr(m.getAddr()); | |||||
| vo.setLongitude(m.getLongitude()); | vo.setLongitude(m.getLongitude()); | ||||
| vo.setLatitude(m.getLatitude()); | vo.setLatitude(m.getLatitude()); | ||||
| return vo; | return vo; | ||||