Просмотр исходного кода

//update

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
52c0269767
6 измененных файлов: 18 добавлений и 13 удалений
  1. +3
    -2
      mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  3. +3
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java
  5. +7
    -4
      mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
  6. +2
    -2
      mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml

+ 3
- 2
mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java Просмотреть файл

@@ -8,6 +8,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import java.math.BigDecimal;
import java.util.Date;

@TableName(value = "tt_merchant_poi")
@@ -34,10 +35,10 @@ public class TtMerchantPoi extends TenantEntity {
private String merchantAddr;

@io.swagger.annotations.ApiModelProperty(value="经度",name="longitude")
private Float longitude;
private BigDecimal longitude;

@io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude")
private Float latitude;
private BigDecimal latitude;

@io.swagger.annotations.ApiModelProperty(value="高德POI ID",name="amapId")
private String amapId;


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Просмотреть файл

@@ -348,9 +348,9 @@ public class WxMerchant extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="经度",name="longitude")
@TableField(exist = false)
private Float longitude;
private BigDecimal longitude;

@io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude")
@TableField(exist = false)
private Float latitude;
private BigDecimal latitude;
}

+ 3
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java Просмотреть файл

@@ -7,6 +7,7 @@ import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -102,11 +103,11 @@ public class WxMerchantVo extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="经度",name="longitude")
@TableField(exist = false)
private Float longitude;
private BigDecimal longitude;

@io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude")
@TableField(exist = false)
private Float latitude;
private BigDecimal latitude;
public void initByMerchant(WxMerchant m) {
this.id = m.getId();


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java Просмотреть файл

@@ -74,7 +74,7 @@ public class MallCooUserInfoServiceImpl implements MallCooUserInfoService {
}
}
if(!basicInfo.getPhone().equals(mallCooUserInfo.getPhone())){
logger.error("更换过手机号,未实现更改手机号同步");
logger.error("更换过手机号,未实现更改手机号同步");
return;
}
McUserInfo info = new McUserInfo();


+ 7
- 4
mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java Просмотреть файл

@@ -113,8 +113,8 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService {
poi.setMerchantProvince(mall.getProvince());
poi.setMerchantCity(mall.getCity());
poi.setMerchantAddr(mall.getAddr());
poi.setLongitude(mall.getLongitude() == null?null:mall.getLongitude().floatValue());
poi.setLatitude(mall.getLatitude() == null?null:mall.getLatitude().floatValue());
poi.setLongitude(mall.getLongitude());
poi.setLatitude(mall.getLatitude());
poi.setMatchStatus(EnumSupplierMathStatus.match_update.getCode());
poi.setCreateDate(now);
poi.setUpdateDate(now);
@@ -178,8 +178,11 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService {
match.setProvince(poi.getMerchantProvince());
match.setCity(poi.getMerchantCity());
match.setAddress(poi.getMerchantAddr());
match.setLongitude(poi.getLongitude());
match.setLatitude(poi.getLatitude());
if(poi.getLongitude() != null && poi.getLatitude() != null){
match.setLongitude(poi.getLongitude().floatValue());
match.setLatitude(poi.getLatitude().floatValue());
}

match.setAmapId(poi.getAmapId());

matchList.getMatchDataList().add(match);


+ 2
- 2
mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml Просмотреть файл

@@ -10,8 +10,8 @@
<result column="merchant_province" jdbcType="VARCHAR" property="merchantProvince"/>
<result column="merchant_city" jdbcType="VARCHAR" property="merchantCity"/>
<result column="merchant_addr" jdbcType="VARCHAR" property="merchantAddr"/>
<result column="longitude" jdbcType="FLOAT" property="longitude"/>
<result column="latitude" jdbcType="FLOAT" property="latitude"/>
<result column="longitude" jdbcType="DECIMAL" property="longitude"/>
<result column="latitude" jdbcType="DECIMAL" property="latitude"/>

<result column="amap_id" jdbcType="VARCHAR" property="amapId"/>
<result column="extra" jdbcType="VARCHAR" property="extra"/>


Загрузка…
Отмена
Сохранить