From d9390b00ddd54f4fabc85a666930d26700aa58a2 Mon Sep 17 00:00:00 2001 From: YuanYe <418471657@qq.com> Date: Mon, 21 Oct 2024 15:00:59 +0800 Subject: [PATCH] 1 --- .../com/hfkj/dao/GoodsUserAddressMapper.java | 115 +++------ .../hfkj/dao/GoodsUserAddressSqlProvider.java | 172 ++++--------- .../com/hfkj/entity/GoodsUserAddress.java | 137 ++++++++++- .../hfkj/entity/GoodsUserAddressExample.java | 226 +++++++++++++++--- 4 files changed, 413 insertions(+), 237 deletions(-) diff --git a/service/src/main/java/com/hfkj/dao/GoodsUserAddressMapper.java b/service/src/main/java/com/hfkj/dao/GoodsUserAddressMapper.java index 5b141ea..ddde115 100644 --- a/service/src/main/java/com/hfkj/dao/GoodsUserAddressMapper.java +++ b/service/src/main/java/com/hfkj/dao/GoodsUserAddressMapper.java @@ -2,7 +2,6 @@ package com.hfkj.dao; import com.hfkj.entity.GoodsUserAddress; import com.hfkj.entity.GoodsUserAddressExample; -import com.hfkj.entity.GoodsUserAddressWithBLOBs; import java.util.List; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.DeleteProvider; @@ -42,53 +41,27 @@ public interface GoodsUserAddressMapper extends GoodsUserAddressMapperExt { @Insert({ "insert into goods_user_address (user_id, consignee, ", "phone, address, ", - "region_id, region_name, ", - "whether_default, create_time, ", - "update_time, op_id, ", - "op_name, ext_1, ext_2, ", - "ext_3, province_id, ", - "city_id, county_id, ", - "town_id)", + "province_id, city_id, ", + "county_id, town_id, ", + "region_name, whether_default, ", + "create_time, update_time, ", + "op_id, op_name, ext_1, ", + "ext_2, ext_3)", "values (#{userId,jdbcType=BIGINT}, #{consignee,jdbcType=VARCHAR}, ", "#{phone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, ", - "#{regionId,jdbcType=VARCHAR}, #{regionName,jdbcType=VARCHAR}, ", - "#{whetherDefault,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{updateTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ", - "#{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", - "#{ext3,jdbcType=VARCHAR}, #{provinceId,jdbcType=LONGVARCHAR}, ", - "#{cityId,jdbcType=LONGVARCHAR}, #{countyId,jdbcType=LONGVARCHAR}, ", - "#{townId,jdbcType=LONGVARCHAR})" + "#{provinceId,jdbcType=BIGINT}, #{cityId,jdbcType=BIGINT}, ", + "#{countyId,jdbcType=BIGINT}, #{townId,jdbcType=BIGINT}, ", + "#{regionName,jdbcType=VARCHAR}, #{whetherDefault,jdbcType=BIT}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") - int insert(GoodsUserAddressWithBLOBs record); + int insert(GoodsUserAddress record); @InsertProvider(type=GoodsUserAddressSqlProvider.class, method="insertSelective") @Options(useGeneratedKeys=true,keyProperty="id") - int insertSelective(GoodsUserAddressWithBLOBs record); - - @SelectProvider(type=GoodsUserAddressSqlProvider.class, method="selectByExampleWithBLOBs") - @Results({ - @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), - @Result(column="consignee", property="consignee", jdbcType=JdbcType.VARCHAR), - @Result(column="phone", property="phone", jdbcType=JdbcType.VARCHAR), - @Result(column="address", property="address", jdbcType=JdbcType.VARCHAR), - @Result(column="region_id", property="regionId", jdbcType=JdbcType.VARCHAR), - @Result(column="region_name", property="regionName", jdbcType=JdbcType.VARCHAR), - @Result(column="whether_default", property="whetherDefault", jdbcType=JdbcType.BIT), - @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT), - @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR), - @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), - @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), - @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR), - @Result(column="province_id", property="provinceId", jdbcType=JdbcType.LONGVARCHAR), - @Result(column="city_id", property="cityId", jdbcType=JdbcType.LONGVARCHAR), - @Result(column="county_id", property="countyId", jdbcType=JdbcType.LONGVARCHAR), - @Result(column="town_id", property="townId", jdbcType=JdbcType.LONGVARCHAR) - }) - List selectByExampleWithBLOBs(GoodsUserAddressExample example); + int insertSelective(GoodsUserAddress record); @SelectProvider(type=GoodsUserAddressSqlProvider.class, method="selectByExample") @Results({ @@ -97,7 +70,10 @@ public interface GoodsUserAddressMapper extends GoodsUserAddressMapperExt { @Result(column="consignee", property="consignee", jdbcType=JdbcType.VARCHAR), @Result(column="phone", property="phone", jdbcType=JdbcType.VARCHAR), @Result(column="address", property="address", jdbcType=JdbcType.VARCHAR), - @Result(column="region_id", property="regionId", jdbcType=JdbcType.VARCHAR), + @Result(column="province_id", property="provinceId", jdbcType=JdbcType.BIGINT), + @Result(column="city_id", property="cityId", jdbcType=JdbcType.BIGINT), + @Result(column="county_id", property="countyId", jdbcType=JdbcType.BIGINT), + @Result(column="town_id", property="townId", jdbcType=JdbcType.BIGINT), @Result(column="region_name", property="regionName", jdbcType=JdbcType.VARCHAR), @Result(column="whether_default", property="whetherDefault", jdbcType=JdbcType.BIT), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -112,9 +88,9 @@ public interface GoodsUserAddressMapper extends GoodsUserAddressMapperExt { @Select({ "select", - "id, user_id, consignee, phone, address, region_id, region_name, whether_default, ", - "create_time, update_time, op_id, op_name, ext_1, ext_2, ext_3, province_id, ", - "city_id, county_id, town_id", + "id, user_id, consignee, phone, address, province_id, city_id, county_id, town_id, ", + "region_name, whether_default, create_time, update_time, op_id, op_name, ext_1, ", + "ext_2, ext_3", "from goods_user_address", "where id = #{id,jdbcType=BIGINT}" }) @@ -124,7 +100,10 @@ public interface GoodsUserAddressMapper extends GoodsUserAddressMapperExt { @Result(column="consignee", property="consignee", jdbcType=JdbcType.VARCHAR), @Result(column="phone", property="phone", jdbcType=JdbcType.VARCHAR), @Result(column="address", property="address", jdbcType=JdbcType.VARCHAR), - @Result(column="region_id", property="regionId", jdbcType=JdbcType.VARCHAR), + @Result(column="province_id", property="provinceId", jdbcType=JdbcType.BIGINT), + @Result(column="city_id", property="cityId", jdbcType=JdbcType.BIGINT), + @Result(column="county_id", property="countyId", jdbcType=JdbcType.BIGINT), + @Result(column="town_id", property="townId", jdbcType=JdbcType.BIGINT), @Result(column="region_name", property="regionName", jdbcType=JdbcType.VARCHAR), @Result(column="whether_default", property="whetherDefault", jdbcType=JdbcType.BIT), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -133,49 +112,18 @@ public interface GoodsUserAddressMapper extends GoodsUserAddressMapperExt { @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), - @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR), - @Result(column="province_id", property="provinceId", jdbcType=JdbcType.LONGVARCHAR), - @Result(column="city_id", property="cityId", jdbcType=JdbcType.LONGVARCHAR), - @Result(column="county_id", property="countyId", jdbcType=JdbcType.LONGVARCHAR), - @Result(column="town_id", property="townId", jdbcType=JdbcType.LONGVARCHAR) + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) }) - GoodsUserAddressWithBLOBs selectByPrimaryKey(Long id); + GoodsUserAddress selectByPrimaryKey(Long id); @UpdateProvider(type=GoodsUserAddressSqlProvider.class, method="updateByExampleSelective") - int updateByExampleSelective(@Param("record") GoodsUserAddressWithBLOBs record, @Param("example") GoodsUserAddressExample example); - - @UpdateProvider(type=GoodsUserAddressSqlProvider.class, method="updateByExampleWithBLOBs") - int updateByExampleWithBLOBs(@Param("record") GoodsUserAddressWithBLOBs record, @Param("example") GoodsUserAddressExample example); + int updateByExampleSelective(@Param("record") GoodsUserAddress record, @Param("example") GoodsUserAddressExample example); @UpdateProvider(type=GoodsUserAddressSqlProvider.class, method="updateByExample") int updateByExample(@Param("record") GoodsUserAddress record, @Param("example") GoodsUserAddressExample example); @UpdateProvider(type=GoodsUserAddressSqlProvider.class, method="updateByPrimaryKeySelective") - int updateByPrimaryKeySelective(GoodsUserAddressWithBLOBs record); - - @Update({ - "update goods_user_address", - "set user_id = #{userId,jdbcType=BIGINT},", - "consignee = #{consignee,jdbcType=VARCHAR},", - "phone = #{phone,jdbcType=VARCHAR},", - "address = #{address,jdbcType=VARCHAR},", - "region_id = #{regionId,jdbcType=VARCHAR},", - "region_name = #{regionName,jdbcType=VARCHAR},", - "whether_default = #{whetherDefault,jdbcType=BIT},", - "create_time = #{createTime,jdbcType=TIMESTAMP},", - "update_time = #{updateTime,jdbcType=TIMESTAMP},", - "op_id = #{opId,jdbcType=BIGINT},", - "op_name = #{opName,jdbcType=VARCHAR},", - "ext_1 = #{ext1,jdbcType=VARCHAR},", - "ext_2 = #{ext2,jdbcType=VARCHAR},", - "ext_3 = #{ext3,jdbcType=VARCHAR},", - "province_id = #{provinceId,jdbcType=LONGVARCHAR},", - "city_id = #{cityId,jdbcType=LONGVARCHAR},", - "county_id = #{countyId,jdbcType=LONGVARCHAR},", - "town_id = #{townId,jdbcType=LONGVARCHAR}", - "where id = #{id,jdbcType=BIGINT}" - }) - int updateByPrimaryKeyWithBLOBs(GoodsUserAddressWithBLOBs record); + int updateByPrimaryKeySelective(GoodsUserAddress record); @Update({ "update goods_user_address", @@ -183,7 +131,10 @@ public interface GoodsUserAddressMapper extends GoodsUserAddressMapperExt { "consignee = #{consignee,jdbcType=VARCHAR},", "phone = #{phone,jdbcType=VARCHAR},", "address = #{address,jdbcType=VARCHAR},", - "region_id = #{regionId,jdbcType=VARCHAR},", + "province_id = #{provinceId,jdbcType=BIGINT},", + "city_id = #{cityId,jdbcType=BIGINT},", + "county_id = #{countyId,jdbcType=BIGINT},", + "town_id = #{townId,jdbcType=BIGINT},", "region_name = #{regionName,jdbcType=VARCHAR},", "whether_default = #{whetherDefault,jdbcType=BIT},", "create_time = #{createTime,jdbcType=TIMESTAMP},", diff --git a/service/src/main/java/com/hfkj/dao/GoodsUserAddressSqlProvider.java b/service/src/main/java/com/hfkj/dao/GoodsUserAddressSqlProvider.java index 695792c..5be9ccd 100644 --- a/service/src/main/java/com/hfkj/dao/GoodsUserAddressSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/GoodsUserAddressSqlProvider.java @@ -1,9 +1,9 @@ package com.hfkj.dao; +import com.hfkj.entity.GoodsUserAddress; import com.hfkj.entity.GoodsUserAddressExample.Criteria; import com.hfkj.entity.GoodsUserAddressExample.Criterion; import com.hfkj.entity.GoodsUserAddressExample; -import com.hfkj.entity.GoodsUserAddressWithBLOBs; import java.util.List; import java.util.Map; import org.apache.ibatis.jdbc.SQL; @@ -24,7 +24,7 @@ public class GoodsUserAddressSqlProvider { return sql.toString(); } - public String insertSelective(GoodsUserAddressWithBLOBs record) { + public String insertSelective(GoodsUserAddress record) { SQL sql = new SQL(); sql.INSERT_INTO("goods_user_address"); @@ -44,8 +44,20 @@ public class GoodsUserAddressSqlProvider { sql.VALUES("address", "#{address,jdbcType=VARCHAR}"); } - if (record.getRegionId() != null) { - sql.VALUES("region_id", "#{regionId,jdbcType=VARCHAR}"); + if (record.getProvinceId() != null) { + sql.VALUES("province_id", "#{provinceId,jdbcType=BIGINT}"); + } + + if (record.getCityId() != null) { + sql.VALUES("city_id", "#{cityId,jdbcType=BIGINT}"); + } + + if (record.getCountyId() != null) { + sql.VALUES("county_id", "#{countyId,jdbcType=BIGINT}"); + } + + if (record.getTownId() != null) { + sql.VALUES("town_id", "#{townId,jdbcType=BIGINT}"); } if (record.getRegionName() != null) { @@ -84,26 +96,10 @@ public class GoodsUserAddressSqlProvider { sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); } - if (record.getProvinceId() != null) { - sql.VALUES("province_id", "#{provinceId,jdbcType=LONGVARCHAR}"); - } - - if (record.getCityId() != null) { - sql.VALUES("city_id", "#{cityId,jdbcType=LONGVARCHAR}"); - } - - if (record.getCountyId() != null) { - sql.VALUES("county_id", "#{countyId,jdbcType=LONGVARCHAR}"); - } - - if (record.getTownId() != null) { - sql.VALUES("town_id", "#{townId,jdbcType=LONGVARCHAR}"); - } - return sql.toString(); } - public String selectByExampleWithBLOBs(GoodsUserAddressExample example) { + public String selectByExample(GoodsUserAddressExample example) { SQL sql = new SQL(); if (example != null && example.isDistinct()) { sql.SELECT_DISTINCT("id"); @@ -114,42 +110,10 @@ public class GoodsUserAddressSqlProvider { sql.SELECT("consignee"); sql.SELECT("phone"); sql.SELECT("address"); - sql.SELECT("region_id"); - sql.SELECT("region_name"); - sql.SELECT("whether_default"); - sql.SELECT("create_time"); - sql.SELECT("update_time"); - sql.SELECT("op_id"); - sql.SELECT("op_name"); - sql.SELECT("ext_1"); - sql.SELECT("ext_2"); - sql.SELECT("ext_3"); sql.SELECT("province_id"); sql.SELECT("city_id"); sql.SELECT("county_id"); sql.SELECT("town_id"); - sql.FROM("goods_user_address"); - applyWhere(sql, example, false); - - if (example != null && example.getOrderByClause() != null) { - sql.ORDER_BY(example.getOrderByClause()); - } - - return sql.toString(); - } - - public String selectByExample(GoodsUserAddressExample example) { - SQL sql = new SQL(); - if (example != null && example.isDistinct()) { - sql.SELECT_DISTINCT("id"); - } else { - sql.SELECT("id"); - } - sql.SELECT("user_id"); - sql.SELECT("consignee"); - sql.SELECT("phone"); - sql.SELECT("address"); - sql.SELECT("region_id"); sql.SELECT("region_name"); sql.SELECT("whether_default"); sql.SELECT("create_time"); @@ -170,7 +134,7 @@ public class GoodsUserAddressSqlProvider { } public String updateByExampleSelective(Map parameter) { - GoodsUserAddressWithBLOBs record = (GoodsUserAddressWithBLOBs) parameter.get("record"); + GoodsUserAddress record = (GoodsUserAddress) parameter.get("record"); GoodsUserAddressExample example = (GoodsUserAddressExample) parameter.get("example"); SQL sql = new SQL(); @@ -196,8 +160,20 @@ public class GoodsUserAddressSqlProvider { sql.SET("address = #{record.address,jdbcType=VARCHAR}"); } - if (record.getRegionId() != null) { - sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}"); + if (record.getProvinceId() != null) { + sql.SET("province_id = #{record.provinceId,jdbcType=BIGINT}"); + } + + if (record.getCityId() != null) { + sql.SET("city_id = #{record.cityId,jdbcType=BIGINT}"); + } + + if (record.getCountyId() != null) { + sql.SET("county_id = #{record.countyId,jdbcType=BIGINT}"); + } + + if (record.getTownId() != null) { + sql.SET("town_id = #{record.townId,jdbcType=BIGINT}"); } if (record.getRegionName() != null) { @@ -236,51 +212,6 @@ public class GoodsUserAddressSqlProvider { sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); } - if (record.getProvinceId() != null) { - sql.SET("province_id = #{record.provinceId,jdbcType=LONGVARCHAR}"); - } - - if (record.getCityId() != null) { - sql.SET("city_id = #{record.cityId,jdbcType=LONGVARCHAR}"); - } - - if (record.getCountyId() != null) { - sql.SET("county_id = #{record.countyId,jdbcType=LONGVARCHAR}"); - } - - if (record.getTownId() != null) { - sql.SET("town_id = #{record.townId,jdbcType=LONGVARCHAR}"); - } - - applyWhere(sql, example, true); - return sql.toString(); - } - - public String updateByExampleWithBLOBs(Map parameter) { - SQL sql = new SQL(); - sql.UPDATE("goods_user_address"); - - sql.SET("id = #{record.id,jdbcType=BIGINT}"); - sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); - sql.SET("consignee = #{record.consignee,jdbcType=VARCHAR}"); - sql.SET("phone = #{record.phone,jdbcType=VARCHAR}"); - sql.SET("address = #{record.address,jdbcType=VARCHAR}"); - sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}"); - sql.SET("region_name = #{record.regionName,jdbcType=VARCHAR}"); - sql.SET("whether_default = #{record.whetherDefault,jdbcType=BIT}"); - sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); - sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); - sql.SET("op_id = #{record.opId,jdbcType=BIGINT}"); - sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}"); - sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); - sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); - sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); - sql.SET("province_id = #{record.provinceId,jdbcType=LONGVARCHAR}"); - sql.SET("city_id = #{record.cityId,jdbcType=LONGVARCHAR}"); - sql.SET("county_id = #{record.countyId,jdbcType=LONGVARCHAR}"); - sql.SET("town_id = #{record.townId,jdbcType=LONGVARCHAR}"); - - GoodsUserAddressExample example = (GoodsUserAddressExample) parameter.get("example"); applyWhere(sql, example, true); return sql.toString(); } @@ -294,7 +225,10 @@ public class GoodsUserAddressSqlProvider { sql.SET("consignee = #{record.consignee,jdbcType=VARCHAR}"); sql.SET("phone = #{record.phone,jdbcType=VARCHAR}"); sql.SET("address = #{record.address,jdbcType=VARCHAR}"); - sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}"); + sql.SET("province_id = #{record.provinceId,jdbcType=BIGINT}"); + sql.SET("city_id = #{record.cityId,jdbcType=BIGINT}"); + sql.SET("county_id = #{record.countyId,jdbcType=BIGINT}"); + sql.SET("town_id = #{record.townId,jdbcType=BIGINT}"); sql.SET("region_name = #{record.regionName,jdbcType=VARCHAR}"); sql.SET("whether_default = #{record.whetherDefault,jdbcType=BIT}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); @@ -310,7 +244,7 @@ public class GoodsUserAddressSqlProvider { return sql.toString(); } - public String updateByPrimaryKeySelective(GoodsUserAddressWithBLOBs record) { + public String updateByPrimaryKeySelective(GoodsUserAddress record) { SQL sql = new SQL(); sql.UPDATE("goods_user_address"); @@ -330,8 +264,20 @@ public class GoodsUserAddressSqlProvider { sql.SET("address = #{address,jdbcType=VARCHAR}"); } - if (record.getRegionId() != null) { - sql.SET("region_id = #{regionId,jdbcType=VARCHAR}"); + if (record.getProvinceId() != null) { + sql.SET("province_id = #{provinceId,jdbcType=BIGINT}"); + } + + if (record.getCityId() != null) { + sql.SET("city_id = #{cityId,jdbcType=BIGINT}"); + } + + if (record.getCountyId() != null) { + sql.SET("county_id = #{countyId,jdbcType=BIGINT}"); + } + + if (record.getTownId() != null) { + sql.SET("town_id = #{townId,jdbcType=BIGINT}"); } if (record.getRegionName() != null) { @@ -370,22 +316,6 @@ public class GoodsUserAddressSqlProvider { sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); } - if (record.getProvinceId() != null) { - sql.SET("province_id = #{provinceId,jdbcType=LONGVARCHAR}"); - } - - if (record.getCityId() != null) { - sql.SET("city_id = #{cityId,jdbcType=LONGVARCHAR}"); - } - - if (record.getCountyId() != null) { - sql.SET("county_id = #{countyId,jdbcType=LONGVARCHAR}"); - } - - if (record.getTownId() != null) { - sql.SET("town_id = #{townId,jdbcType=LONGVARCHAR}"); - } - sql.WHERE("id = #{id,jdbcType=BIGINT}"); return sql.toString(); diff --git a/service/src/main/java/com/hfkj/entity/GoodsUserAddress.java b/service/src/main/java/com/hfkj/entity/GoodsUserAddress.java index b9e92b6..230d887 100644 --- a/service/src/main/java/com/hfkj/entity/GoodsUserAddress.java +++ b/service/src/main/java/com/hfkj/entity/GoodsUserAddress.java @@ -39,9 +39,24 @@ public class GoodsUserAddress implements Serializable { private String address; /** - * 区域编码 + * 一级地址编号 */ - private String regionId; + private Long provinceId; + + /** + * 二级地址编号 + */ + private Long cityId; + + /** + * 三级地址编号 + */ + private Long countyId; + + /** + * 四级地址编号 + */ + private Long townId; /** * 区域名称 @@ -130,12 +145,36 @@ public class GoodsUserAddress implements Serializable { this.address = address; } - public String getRegionId() { - return regionId; + public Long getProvinceId() { + return provinceId; + } + + public void setProvinceId(Long provinceId) { + this.provinceId = provinceId; } - public void setRegionId(String regionId) { - this.regionId = regionId; + public Long getCityId() { + return cityId; + } + + public void setCityId(Long cityId) { + this.cityId = cityId; + } + + public Long getCountyId() { + return countyId; + } + + public void setCountyId(Long countyId) { + this.countyId = countyId; + } + + public Long getTownId() { + return townId; + } + + public void setTownId(Long townId) { + this.townId = townId; } public String getRegionName() { @@ -209,4 +248,90 @@ public class GoodsUserAddress implements Serializable { public void setExt3(String ext3) { this.ext3 = ext3; } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + GoodsUserAddress other = (GoodsUserAddress) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) + && (this.getConsignee() == null ? other.getConsignee() == null : this.getConsignee().equals(other.getConsignee())) + && (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone())) + && (this.getAddress() == null ? other.getAddress() == null : this.getAddress().equals(other.getAddress())) + && (this.getProvinceId() == null ? other.getProvinceId() == null : this.getProvinceId().equals(other.getProvinceId())) + && (this.getCityId() == null ? other.getCityId() == null : this.getCityId().equals(other.getCityId())) + && (this.getCountyId() == null ? other.getCountyId() == null : this.getCountyId().equals(other.getCountyId())) + && (this.getTownId() == null ? other.getTownId() == null : this.getTownId().equals(other.getTownId())) + && (this.getRegionName() == null ? other.getRegionName() == null : this.getRegionName().equals(other.getRegionName())) + && (this.getWhetherDefault() == null ? other.getWhetherDefault() == null : this.getWhetherDefault().equals(other.getWhetherDefault())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) + && (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId())) + && (this.getOpName() == null ? other.getOpName() == null : this.getOpName().equals(other.getOpName())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); + result = prime * result + ((getConsignee() == null) ? 0 : getConsignee().hashCode()); + result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode()); + result = prime * result + ((getAddress() == null) ? 0 : getAddress().hashCode()); + result = prime * result + ((getProvinceId() == null) ? 0 : getProvinceId().hashCode()); + result = prime * result + ((getCityId() == null) ? 0 : getCityId().hashCode()); + result = prime * result + ((getCountyId() == null) ? 0 : getCountyId().hashCode()); + result = prime * result + ((getTownId() == null) ? 0 : getTownId().hashCode()); + result = prime * result + ((getRegionName() == null) ? 0 : getRegionName().hashCode()); + result = prime * result + ((getWhetherDefault() == null) ? 0 : getWhetherDefault().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode()); + result = prime * result + ((getOpName() == null) ? 0 : getOpName().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", userId=").append(userId); + sb.append(", consignee=").append(consignee); + sb.append(", phone=").append(phone); + sb.append(", address=").append(address); + sb.append(", provinceId=").append(provinceId); + sb.append(", cityId=").append(cityId); + sb.append(", countyId=").append(countyId); + sb.append(", townId=").append(townId); + sb.append(", regionName=").append(regionName); + sb.append(", whetherDefault=").append(whetherDefault); + sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); + sb.append(", opId=").append(opId); + sb.append(", opName=").append(opName); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } } \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/GoodsUserAddressExample.java b/service/src/main/java/com/hfkj/entity/GoodsUserAddressExample.java index d83a7e6..fe3bc33 100644 --- a/service/src/main/java/com/hfkj/entity/GoodsUserAddressExample.java +++ b/service/src/main/java/com/hfkj/entity/GoodsUserAddressExample.java @@ -455,73 +455,243 @@ public class GoodsUserAddressExample { return (Criteria) this; } - public Criteria andRegionIdIsNull() { - addCriterion("region_id is null"); + public Criteria andProvinceIdIsNull() { + addCriterion("province_id is null"); return (Criteria) this; } - public Criteria andRegionIdIsNotNull() { - addCriterion("region_id is not null"); + public Criteria andProvinceIdIsNotNull() { + addCriterion("province_id is not null"); return (Criteria) this; } - public Criteria andRegionIdEqualTo(String value) { - addCriterion("region_id =", value, "regionId"); + public Criteria andProvinceIdEqualTo(Long value) { + addCriterion("province_id =", value, "provinceId"); return (Criteria) this; } - public Criteria andRegionIdNotEqualTo(String value) { - addCriterion("region_id <>", value, "regionId"); + public Criteria andProvinceIdNotEqualTo(Long value) { + addCriterion("province_id <>", value, "provinceId"); return (Criteria) this; } - public Criteria andRegionIdGreaterThan(String value) { - addCriterion("region_id >", value, "regionId"); + public Criteria andProvinceIdGreaterThan(Long value) { + addCriterion("province_id >", value, "provinceId"); return (Criteria) this; } - public Criteria andRegionIdGreaterThanOrEqualTo(String value) { - addCriterion("region_id >=", value, "regionId"); + public Criteria andProvinceIdGreaterThanOrEqualTo(Long value) { + addCriterion("province_id >=", value, "provinceId"); return (Criteria) this; } - public Criteria andRegionIdLessThan(String value) { - addCriterion("region_id <", value, "regionId"); + public Criteria andProvinceIdLessThan(Long value) { + addCriterion("province_id <", value, "provinceId"); return (Criteria) this; } - public Criteria andRegionIdLessThanOrEqualTo(String value) { - addCriterion("region_id <=", value, "regionId"); + public Criteria andProvinceIdLessThanOrEqualTo(Long value) { + addCriterion("province_id <=", value, "provinceId"); return (Criteria) this; } - public Criteria andRegionIdLike(String value) { - addCriterion("region_id like", value, "regionId"); + public Criteria andProvinceIdIn(List values) { + addCriterion("province_id in", values, "provinceId"); return (Criteria) this; } - public Criteria andRegionIdNotLike(String value) { - addCriterion("region_id not like", value, "regionId"); + public Criteria andProvinceIdNotIn(List values) { + addCriterion("province_id not in", values, "provinceId"); return (Criteria) this; } - public Criteria andRegionIdIn(List values) { - addCriterion("region_id in", values, "regionId"); + public Criteria andProvinceIdBetween(Long value1, Long value2) { + addCriterion("province_id between", value1, value2, "provinceId"); return (Criteria) this; } - public Criteria andRegionIdNotIn(List values) { - addCriterion("region_id not in", values, "regionId"); + public Criteria andProvinceIdNotBetween(Long value1, Long value2) { + addCriterion("province_id not between", value1, value2, "provinceId"); return (Criteria) this; } - public Criteria andRegionIdBetween(String value1, String value2) { - addCriterion("region_id between", value1, value2, "regionId"); + public Criteria andCityIdIsNull() { + addCriterion("city_id is null"); return (Criteria) this; } - public Criteria andRegionIdNotBetween(String value1, String value2) { - addCriterion("region_id not between", value1, value2, "regionId"); + public Criteria andCityIdIsNotNull() { + addCriterion("city_id is not null"); + return (Criteria) this; + } + + public Criteria andCityIdEqualTo(Long value) { + addCriterion("city_id =", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdNotEqualTo(Long value) { + addCriterion("city_id <>", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdGreaterThan(Long value) { + addCriterion("city_id >", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdGreaterThanOrEqualTo(Long value) { + addCriterion("city_id >=", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdLessThan(Long value) { + addCriterion("city_id <", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdLessThanOrEqualTo(Long value) { + addCriterion("city_id <=", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdIn(List values) { + addCriterion("city_id in", values, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdNotIn(List values) { + addCriterion("city_id not in", values, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdBetween(Long value1, Long value2) { + addCriterion("city_id between", value1, value2, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdNotBetween(Long value1, Long value2) { + addCriterion("city_id not between", value1, value2, "cityId"); + return (Criteria) this; + } + + public Criteria andCountyIdIsNull() { + addCriterion("county_id is null"); + return (Criteria) this; + } + + public Criteria andCountyIdIsNotNull() { + addCriterion("county_id is not null"); + return (Criteria) this; + } + + public Criteria andCountyIdEqualTo(Long value) { + addCriterion("county_id =", value, "countyId"); + return (Criteria) this; + } + + public Criteria andCountyIdNotEqualTo(Long value) { + addCriterion("county_id <>", value, "countyId"); + return (Criteria) this; + } + + public Criteria andCountyIdGreaterThan(Long value) { + addCriterion("county_id >", value, "countyId"); + return (Criteria) this; + } + + public Criteria andCountyIdGreaterThanOrEqualTo(Long value) { + addCriterion("county_id >=", value, "countyId"); + return (Criteria) this; + } + + public Criteria andCountyIdLessThan(Long value) { + addCriterion("county_id <", value, "countyId"); + return (Criteria) this; + } + + public Criteria andCountyIdLessThanOrEqualTo(Long value) { + addCriterion("county_id <=", value, "countyId"); + return (Criteria) this; + } + + public Criteria andCountyIdIn(List values) { + addCriterion("county_id in", values, "countyId"); + return (Criteria) this; + } + + public Criteria andCountyIdNotIn(List values) { + addCriterion("county_id not in", values, "countyId"); + return (Criteria) this; + } + + public Criteria andCountyIdBetween(Long value1, Long value2) { + addCriterion("county_id between", value1, value2, "countyId"); + return (Criteria) this; + } + + public Criteria andCountyIdNotBetween(Long value1, Long value2) { + addCriterion("county_id not between", value1, value2, "countyId"); + return (Criteria) this; + } + + public Criteria andTownIdIsNull() { + addCriterion("town_id is null"); + return (Criteria) this; + } + + public Criteria andTownIdIsNotNull() { + addCriterion("town_id is not null"); + return (Criteria) this; + } + + public Criteria andTownIdEqualTo(Long value) { + addCriterion("town_id =", value, "townId"); + return (Criteria) this; + } + + public Criteria andTownIdNotEqualTo(Long value) { + addCriterion("town_id <>", value, "townId"); + return (Criteria) this; + } + + public Criteria andTownIdGreaterThan(Long value) { + addCriterion("town_id >", value, "townId"); + return (Criteria) this; + } + + public Criteria andTownIdGreaterThanOrEqualTo(Long value) { + addCriterion("town_id >=", value, "townId"); + return (Criteria) this; + } + + public Criteria andTownIdLessThan(Long value) { + addCriterion("town_id <", value, "townId"); + return (Criteria) this; + } + + public Criteria andTownIdLessThanOrEqualTo(Long value) { + addCriterion("town_id <=", value, "townId"); + return (Criteria) this; + } + + public Criteria andTownIdIn(List values) { + addCriterion("town_id in", values, "townId"); + return (Criteria) this; + } + + public Criteria andTownIdNotIn(List values) { + addCriterion("town_id not in", values, "townId"); + return (Criteria) this; + } + + public Criteria andTownIdBetween(Long value1, Long value2) { + addCriterion("town_id between", value1, value2, "townId"); + return (Criteria) this; + } + + public Criteria andTownIdNotBetween(Long value1, Long value2) { + addCriterion("town_id not between", value1, value2, "townId"); return (Criteria) this; }