| @@ -8,6 +8,7 @@ import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import lombok.ToString; | import lombok.ToString; | ||||
| import java.math.BigDecimal; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| @TableName(value = "tt_merchant_poi") | @TableName(value = "tt_merchant_poi") | ||||
| @@ -34,10 +35,10 @@ public class TtMerchantPoi extends TenantEntity { | |||||
| private String merchantAddr; | private String merchantAddr; | ||||
| @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") | @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") | ||||
| private Float longitude; | |||||
| private BigDecimal longitude; | |||||
| @io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude") | @io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude") | ||||
| private Float latitude; | |||||
| private BigDecimal latitude; | |||||
| @io.swagger.annotations.ApiModelProperty(value="高德POI ID",name="amapId") | @io.swagger.annotations.ApiModelProperty(value="高德POI ID",name="amapId") | ||||
| private String amapId; | private String amapId; | ||||
| @@ -348,9 +348,9 @@ public class WxMerchant extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") | @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Float longitude; | |||||
| private BigDecimal longitude; | |||||
| @io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude") | @io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Float latitude; | |||||
| private BigDecimal latitude; | |||||
| } | } | ||||
| @@ -7,6 +7,7 @@ import com.iformall.domain.po.base.TenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import java.math.BigDecimal; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -102,11 +103,11 @@ public class WxMerchantVo extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") | @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Float longitude; | |||||
| private BigDecimal longitude; | |||||
| @io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude") | @io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Float latitude; | |||||
| private BigDecimal latitude; | |||||
| public void initByMerchant(WxMerchant m) { | public void initByMerchant(WxMerchant m) { | ||||
| this.id = m.getId(); | this.id = m.getId(); | ||||
| @@ -74,7 +74,7 @@ public class MallCooUserInfoServiceImpl implements MallCooUserInfoService { | |||||
| } | } | ||||
| } | } | ||||
| if(!basicInfo.getPhone().equals(mallCooUserInfo.getPhone())){ | if(!basicInfo.getPhone().equals(mallCooUserInfo.getPhone())){ | ||||
| logger.error("更换过手机号,咱未实现更改手机号同步"); | |||||
| logger.error("更换过手机号,未实现更改手机号同步"); | |||||
| return; | return; | ||||
| } | } | ||||
| McUserInfo info = new McUserInfo(); | McUserInfo info = new McUserInfo(); | ||||
| @@ -113,8 +113,8 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { | |||||
| poi.setMerchantProvince(mall.getProvince()); | poi.setMerchantProvince(mall.getProvince()); | ||||
| poi.setMerchantCity(mall.getCity()); | poi.setMerchantCity(mall.getCity()); | ||||
| poi.setMerchantAddr(mall.getAddr()); | 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.setMatchStatus(EnumSupplierMathStatus.match_update.getCode()); | ||||
| poi.setCreateDate(now); | poi.setCreateDate(now); | ||||
| poi.setUpdateDate(now); | poi.setUpdateDate(now); | ||||
| @@ -178,8 +178,11 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { | |||||
| match.setProvince(poi.getMerchantProvince()); | match.setProvince(poi.getMerchantProvince()); | ||||
| match.setCity(poi.getMerchantCity()); | match.setCity(poi.getMerchantCity()); | ||||
| match.setAddress(poi.getMerchantAddr()); | 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()); | match.setAmapId(poi.getAmapId()); | ||||
| matchList.getMatchDataList().add(match); | matchList.getMatchDataList().add(match); | ||||
| @@ -10,8 +10,8 @@ | |||||
| <result column="merchant_province" jdbcType="VARCHAR" property="merchantProvince"/> | <result column="merchant_province" jdbcType="VARCHAR" property="merchantProvince"/> | ||||
| <result column="merchant_city" jdbcType="VARCHAR" property="merchantCity"/> | <result column="merchant_city" jdbcType="VARCHAR" property="merchantCity"/> | ||||
| <result column="merchant_addr" jdbcType="VARCHAR" property="merchantAddr"/> | <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="amap_id" jdbcType="VARCHAR" property="amapId"/> | ||||
| <result column="extra" jdbcType="VARCHAR" property="extra"/> | <result column="extra" jdbcType="VARCHAR" property="extra"/> | ||||