소스 검색

//update

release_toaliyun_real
xhxu 4 년 전
부모
커밋
2397f0b516
3개의 변경된 파일7개의 추가작업 그리고 0개의 파일을 삭제
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java 파일 보기

@@ -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;


+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java 파일 보기

@@ -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();
} }


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java 파일 보기

@@ -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;


불러오는 중...
취소
저장