diff --git a/hai-service/src/main/java/com/hai/dao/GoodsDeliveryAddressMapper.java b/hai-service/src/main/java/com/hai/dao/GoodsDeliveryAddressMapper.java index e1f1a341..55d7b4b1 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsDeliveryAddressMapper.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsDeliveryAddressMapper.java @@ -41,16 +41,18 @@ public interface GoodsDeliveryAddressMapper extends GoodsDeliveryAddressMapperEx @Insert({ "insert into goods_delivery_address (user_id, consignee, ", "phone, address, ", - "regionId, whether_default, ", - "create_time, update_time, ", - "op_id, op_name, ext_1, ", - "ext_2, ext_3)", + "region_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}, #{whetherDefault,jdbcType=BIT}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,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})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(GoodsDeliveryAddress record); @@ -66,7 +68,8 @@ public interface GoodsDeliveryAddressMapper extends GoodsDeliveryAddressMapperEx @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="regionId", property="regionid", 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), @@ -80,8 +83,8 @@ public interface GoodsDeliveryAddressMapper extends GoodsDeliveryAddressMapperEx @Select({ "select", - "id, user_id, consignee, phone, address, regionId, whether_default, create_time, ", - "update_time, op_id, op_name, ext_1, ext_2, ext_3", + "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", "from goods_delivery_address", "where id = #{id,jdbcType=BIGINT}" }) @@ -91,7 +94,8 @@ public interface GoodsDeliveryAddressMapper extends GoodsDeliveryAddressMapperEx @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="regionId", property="regionid", 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), @@ -118,7 +122,8 @@ public interface GoodsDeliveryAddressMapper extends GoodsDeliveryAddressMapperEx "consignee = #{consignee,jdbcType=VARCHAR},", "phone = #{phone,jdbcType=VARCHAR},", "address = #{address,jdbcType=VARCHAR},", - "regionId = #{regionid,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},", diff --git a/hai-service/src/main/java/com/hai/dao/GoodsDeliveryAddressSqlProvider.java b/hai-service/src/main/java/com/hai/dao/GoodsDeliveryAddressSqlProvider.java index c0f3b62b..34e437e3 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsDeliveryAddressSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsDeliveryAddressSqlProvider.java @@ -44,8 +44,12 @@ public class GoodsDeliveryAddressSqlProvider { sql.VALUES("address", "#{address,jdbcType=VARCHAR}"); } - if (record.getRegionid() != null) { - sql.VALUES("regionId", "#{regionid,jdbcType=VARCHAR}"); + if (record.getRegionId() != null) { + sql.VALUES("region_id", "#{regionId,jdbcType=VARCHAR}"); + } + + if (record.getRegionName() != null) { + sql.VALUES("region_name", "#{regionName,jdbcType=VARCHAR}"); } if (record.getWhetherDefault() != null) { @@ -94,7 +98,8 @@ public class GoodsDeliveryAddressSqlProvider { sql.SELECT("consignee"); sql.SELECT("phone"); sql.SELECT("address"); - sql.SELECT("regionId"); + sql.SELECT("region_id"); + sql.SELECT("region_name"); sql.SELECT("whether_default"); sql.SELECT("create_time"); sql.SELECT("update_time"); @@ -140,8 +145,12 @@ public class GoodsDeliveryAddressSqlProvider { sql.SET("address = #{record.address,jdbcType=VARCHAR}"); } - if (record.getRegionid() != null) { - sql.SET("regionId = #{record.regionid,jdbcType=VARCHAR}"); + if (record.getRegionId() != null) { + sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}"); + } + + if (record.getRegionName() != null) { + sql.SET("region_name = #{record.regionName,jdbcType=VARCHAR}"); } if (record.getWhetherDefault() != null) { @@ -189,7 +198,8 @@ public class GoodsDeliveryAddressSqlProvider { sql.SET("consignee = #{record.consignee,jdbcType=VARCHAR}"); sql.SET("phone = #{record.phone,jdbcType=VARCHAR}"); sql.SET("address = #{record.address,jdbcType=VARCHAR}"); - sql.SET("regionId = #{record.regionid,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}"); @@ -224,8 +234,12 @@ public class GoodsDeliveryAddressSqlProvider { sql.SET("address = #{address,jdbcType=VARCHAR}"); } - if (record.getRegionid() != null) { - sql.SET("regionId = #{regionid,jdbcType=VARCHAR}"); + if (record.getRegionId() != null) { + sql.SET("region_id = #{regionId,jdbcType=VARCHAR}"); + } + + if (record.getRegionName() != null) { + sql.SET("region_name = #{regionName,jdbcType=VARCHAR}"); } if (record.getWhetherDefault() != null) { diff --git a/hai-service/src/main/java/com/hai/entity/GoodsDeliveryAddress.java b/hai-service/src/main/java/com/hai/entity/GoodsDeliveryAddress.java index 7c047e2a..aa61701d 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsDeliveryAddress.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsDeliveryAddress.java @@ -41,7 +41,12 @@ public class GoodsDeliveryAddress implements Serializable { /** * 区域编码 */ - private String regionid; + private String regionId; + + /** + * 区域名称 + */ + private String regionName; /** * 是否默认地址 @@ -125,12 +130,20 @@ public class GoodsDeliveryAddress implements Serializable { this.address = address; } - public String getRegionid() { - return regionid; + public String getRegionId() { + return regionId; + } + + public void setRegionId(String regionId) { + this.regionId = regionId; + } + + public String getRegionName() { + return regionName; } - public void setRegionid(String regionid) { - this.regionid = regionid; + public void setRegionName(String regionName) { + this.regionName = regionName; } public Boolean getWhetherDefault() { @@ -214,7 +227,8 @@ public class GoodsDeliveryAddress implements Serializable { && (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.getRegionid() == null ? other.getRegionid() == null : this.getRegionid().equals(other.getRegionid())) + && (this.getRegionId() == null ? other.getRegionId() == null : this.getRegionId().equals(other.getRegionId())) + && (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())) @@ -234,7 +248,8 @@ public class GoodsDeliveryAddress implements Serializable { 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 + ((getRegionid() == null) ? 0 : getRegionid().hashCode()); + result = prime * result + ((getRegionId() == null) ? 0 : getRegionId().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()); @@ -257,7 +272,8 @@ public class GoodsDeliveryAddress implements Serializable { sb.append(", consignee=").append(consignee); sb.append(", phone=").append(phone); sb.append(", address=").append(address); - sb.append(", regionid=").append(regionid); + sb.append(", regionId=").append(regionId); + sb.append(", regionName=").append(regionName); sb.append(", whetherDefault=").append(whetherDefault); sb.append(", createTime=").append(createTime); sb.append(", updateTime=").append(updateTime); diff --git a/hai-service/src/main/java/com/hai/entity/GoodsDeliveryAddressExample.java b/hai-service/src/main/java/com/hai/entity/GoodsDeliveryAddressExample.java index 0d822578..248c61d0 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsDeliveryAddressExample.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsDeliveryAddressExample.java @@ -455,73 +455,143 @@ public class GoodsDeliveryAddressExample { return (Criteria) this; } - public Criteria andRegionidIsNull() { - addCriterion("regionId is null"); + public Criteria andRegionIdIsNull() { + addCriterion("region_id is null"); return (Criteria) this; } - public Criteria andRegionidIsNotNull() { - addCriterion("regionId is not null"); + public Criteria andRegionIdIsNotNull() { + addCriterion("region_id is not null"); return (Criteria) this; } - public Criteria andRegionidEqualTo(String value) { - addCriterion("regionId =", value, "regionid"); + public Criteria andRegionIdEqualTo(String value) { + addCriterion("region_id =", value, "regionId"); return (Criteria) this; } - public Criteria andRegionidNotEqualTo(String value) { - addCriterion("regionId <>", value, "regionid"); + public Criteria andRegionIdNotEqualTo(String value) { + addCriterion("region_id <>", value, "regionId"); return (Criteria) this; } - public Criteria andRegionidGreaterThan(String value) { - addCriterion("regionId >", value, "regionid"); + public Criteria andRegionIdGreaterThan(String value) { + addCriterion("region_id >", value, "regionId"); return (Criteria) this; } - public Criteria andRegionidGreaterThanOrEqualTo(String value) { - addCriterion("regionId >=", value, "regionid"); + public Criteria andRegionIdGreaterThanOrEqualTo(String value) { + addCriterion("region_id >=", value, "regionId"); return (Criteria) this; } - public Criteria andRegionidLessThan(String value) { - addCriterion("regionId <", value, "regionid"); + public Criteria andRegionIdLessThan(String value) { + addCriterion("region_id <", value, "regionId"); return (Criteria) this; } - public Criteria andRegionidLessThanOrEqualTo(String value) { - addCriterion("regionId <=", value, "regionid"); + public Criteria andRegionIdLessThanOrEqualTo(String value) { + addCriterion("region_id <=", value, "regionId"); return (Criteria) this; } - public Criteria andRegionidLike(String value) { - addCriterion("regionId like", value, "regionid"); + public Criteria andRegionIdLike(String value) { + addCriterion("region_id like", value, "regionId"); return (Criteria) this; } - public Criteria andRegionidNotLike(String value) { - addCriterion("regionId not like", value, "regionid"); + public Criteria andRegionIdNotLike(String value) { + addCriterion("region_id not like", value, "regionId"); return (Criteria) this; } - public Criteria andRegionidIn(List values) { - addCriterion("regionId in", values, "regionid"); + public Criteria andRegionIdIn(List values) { + addCriterion("region_id in", values, "regionId"); return (Criteria) this; } - public Criteria andRegionidNotIn(List values) { - addCriterion("regionId not in", values, "regionid"); + public Criteria andRegionIdNotIn(List values) { + addCriterion("region_id not in", values, "regionId"); return (Criteria) this; } - public Criteria andRegionidBetween(String value1, String value2) { - addCriterion("regionId between", value1, value2, "regionid"); + public Criteria andRegionIdBetween(String value1, String value2) { + addCriterion("region_id between", value1, value2, "regionId"); return (Criteria) this; } - public Criteria andRegionidNotBetween(String value1, String value2) { - addCriterion("regionId not between", value1, value2, "regionid"); + public Criteria andRegionIdNotBetween(String value1, String value2) { + addCriterion("region_id not between", value1, value2, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionNameIsNull() { + addCriterion("region_name is null"); + return (Criteria) this; + } + + public Criteria andRegionNameIsNotNull() { + addCriterion("region_name is not null"); + return (Criteria) this; + } + + public Criteria andRegionNameEqualTo(String value) { + addCriterion("region_name =", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameNotEqualTo(String value) { + addCriterion("region_name <>", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameGreaterThan(String value) { + addCriterion("region_name >", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameGreaterThanOrEqualTo(String value) { + addCriterion("region_name >=", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameLessThan(String value) { + addCriterion("region_name <", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameLessThanOrEqualTo(String value) { + addCriterion("region_name <=", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameLike(String value) { + addCriterion("region_name like", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameNotLike(String value) { + addCriterion("region_name not like", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameIn(List values) { + addCriterion("region_name in", values, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameNotIn(List values) { + addCriterion("region_name not in", values, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameBetween(String value1, String value2) { + addCriterion("region_name between", value1, value2, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameNotBetween(String value1, String value2) { + addCriterion("region_name not between", value1, value2, "regionName"); return (Criteria) this; }