diff --git a/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java b/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java
index c30c9431e..23d4898e8 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java
+++ b/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;
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 9dbe1be05..b26ca9f64 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
+++ b/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;
}
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 0a230f5fd..99b3a4a6d 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
+++ b/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();
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java
index d1d82df5c..18d2e8bc1 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java
+++ b/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();
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
index 03a94e472..167c021dd 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
+++ b/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);
diff --git a/mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml b/mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml
index c454a8489..1014e3183 100644
--- a/mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml
+++ b/mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml
@@ -10,8 +10,8 @@
-
-
+
+