From a36a11df78459323938ededd3d4fc67506d8c10e Mon Sep 17 00:00:00 2001 From: YuanYe <418471657@qq.com> Date: Mon, 5 Aug 2024 17:13:27 +0800 Subject: [PATCH] 1 --- .../com/hfkj/dao/BsOrderStarbucksMapper.java | 24 ++- .../hfkj/dao/BsOrderStarbucksSqlProvider.java | 28 ++++ .../com/hfkj/entity/BsOrderStarbucks.java | 32 ++++ .../hfkj/entity/BsOrderStarbucksExample.java | 140 ++++++++++++++++++ 4 files changed, 216 insertions(+), 8 deletions(-) diff --git a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java index d639b92..6827796 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java @@ -47,9 +47,10 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { "img, `name`, order_no, ", "child_order_no, mer_id, ", "user_id, user_phone, ", - "price, `status`, create_time, ", - "update_time, ext_1, ", - "ext_2, ext_3)", + "price, store_address, ", + "store_name, `status`, ", + "create_time, update_time, ", + "ext_1, ext_2, ext_3)", "values (#{storeCode,jdbcType=VARCHAR}, #{platformUniqueId,jdbcType=VARCHAR}, ", "#{productId,jdbcType=INTEGER}, #{cupSize,jdbcType=VARCHAR}, ", "#{temperature,jdbcType=VARCHAR}, #{cream,jdbcType=VARCHAR}, ", @@ -58,9 +59,10 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { "#{img,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, ", "#{childOrderNo,jdbcType=VARCHAR}, #{merId,jdbcType=BIGINT}, ", "#{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ", - "#{price,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{price,jdbcType=DECIMAL}, #{storeAddress,jdbcType=VARCHAR}, ", + "#{storeName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsOrderStarbucks record); @@ -90,6 +92,8 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL), + @Result(column="store_address", property="storeAddress", jdbcType=JdbcType.VARCHAR), + @Result(column="store_name", property="storeName", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @@ -103,8 +107,8 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { "select", "id, store_code, platform_unique_id, product_id, cup_size, temperature, cream, ", "espresso, milk, milk_bubble, num, img, `name`, order_no, child_order_no, mer_id, ", - "user_id, user_phone, price, `status`, create_time, update_time, ext_1, ext_2, ", - "ext_3", + "user_id, user_phone, price, store_address, store_name, `status`, create_time, ", + "update_time, ext_1, ext_2, ext_3", "from bs_order_starbucks", "where id = #{id,jdbcType=BIGINT}" }) @@ -128,6 +132,8 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL), + @Result(column="store_address", property="storeAddress", jdbcType=JdbcType.VARCHAR), + @Result(column="store_name", property="storeName", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @@ -166,6 +172,8 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { "user_id = #{userId,jdbcType=BIGINT},", "user_phone = #{userPhone,jdbcType=VARCHAR},", "price = #{price,jdbcType=DECIMAL},", + "store_address = #{storeAddress,jdbcType=VARCHAR},", + "store_name = #{storeName,jdbcType=VARCHAR},", "`status` = #{status,jdbcType=INTEGER},", "create_time = #{createTime,jdbcType=TIMESTAMP},", "update_time = #{updateTime,jdbcType=TIMESTAMP},", diff --git a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java index f5b4ec1..d27773b 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java @@ -100,6 +100,14 @@ public class BsOrderStarbucksSqlProvider { sql.VALUES("price", "#{price,jdbcType=DECIMAL}"); } + if (record.getStoreAddress() != null) { + sql.VALUES("store_address", "#{storeAddress,jdbcType=VARCHAR}"); + } + + if (record.getStoreName() != null) { + sql.VALUES("store_name", "#{storeName,jdbcType=VARCHAR}"); + } + if (record.getStatus() != null) { sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } @@ -152,6 +160,8 @@ public class BsOrderStarbucksSqlProvider { sql.SELECT("user_id"); sql.SELECT("user_phone"); sql.SELECT("price"); + sql.SELECT("store_address"); + sql.SELECT("store_name"); sql.SELECT("`status`"); sql.SELECT("create_time"); sql.SELECT("update_time"); @@ -251,6 +261,14 @@ public class BsOrderStarbucksSqlProvider { sql.SET("price = #{record.price,jdbcType=DECIMAL}"); } + if (record.getStoreAddress() != null) { + sql.SET("store_address = #{record.storeAddress,jdbcType=VARCHAR}"); + } + + if (record.getStoreName() != null) { + sql.SET("store_name = #{record.storeName,jdbcType=VARCHAR}"); + } + if (record.getStatus() != null) { sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } @@ -302,6 +320,8 @@ public class BsOrderStarbucksSqlProvider { sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); sql.SET("price = #{record.price,jdbcType=DECIMAL}"); + sql.SET("store_address = #{record.storeAddress,jdbcType=VARCHAR}"); + sql.SET("store_name = #{record.storeName,jdbcType=VARCHAR}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); @@ -390,6 +410,14 @@ public class BsOrderStarbucksSqlProvider { sql.SET("price = #{price,jdbcType=DECIMAL}"); } + if (record.getStoreAddress() != null) { + sql.SET("store_address = #{storeAddress,jdbcType=VARCHAR}"); + } + + if (record.getStoreName() != null) { + sql.SET("store_name = #{storeName,jdbcType=VARCHAR}"); + } + if (record.getStatus() != null) { sql.SET("`status` = #{status,jdbcType=INTEGER}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java b/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java index 422ad0c..76df71d 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java @@ -52,6 +52,16 @@ public class BsOrderStarbucks implements Serializable { private BigDecimal price; + /** + * 门店地址 + */ + private String storeAddress; + + /** + * 门店名称 + */ + private String storeName; + private Integer status; private Date createTime; @@ -218,6 +228,22 @@ public class BsOrderStarbucks implements Serializable { this.price = price; } + public String getStoreAddress() { + return storeAddress; + } + + public void setStoreAddress(String storeAddress) { + this.storeAddress = storeAddress; + } + + public String getStoreName() { + return storeName; + } + + public void setStoreName(String storeName) { + this.storeName = storeName; + } + public Integer getStatus() { return status; } @@ -297,6 +323,8 @@ public class BsOrderStarbucks implements Serializable { && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone())) && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) + && (this.getStoreAddress() == null ? other.getStoreAddress() == null : this.getStoreAddress().equals(other.getStoreAddress())) + && (this.getStoreName() == null ? other.getStoreName() == null : this.getStoreName().equals(other.getStoreName())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) @@ -328,6 +356,8 @@ public class BsOrderStarbucks implements Serializable { result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode()); result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode()); + result = prime * result + ((getStoreAddress() == null) ? 0 : getStoreAddress().hashCode()); + result = prime * result + ((getStoreName() == null) ? 0 : getStoreName().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); @@ -362,6 +392,8 @@ public class BsOrderStarbucks implements Serializable { sb.append(", userId=").append(userId); sb.append(", userPhone=").append(userPhone); sb.append(", price=").append(price); + sb.append(", storeAddress=").append(storeAddress); + sb.append(", storeName=").append(storeName); sb.append(", status=").append(status); sb.append(", createTime=").append(createTime); sb.append(", updateTime=").append(updateTime); diff --git a/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java b/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java index cec3dd0..8589c50 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java @@ -1396,6 +1396,146 @@ public class BsOrderStarbucksExample { return (Criteria) this; } + public Criteria andStoreAddressIsNull() { + addCriterion("store_address is null"); + return (Criteria) this; + } + + public Criteria andStoreAddressIsNotNull() { + addCriterion("store_address is not null"); + return (Criteria) this; + } + + public Criteria andStoreAddressEqualTo(String value) { + addCriterion("store_address =", value, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreAddressNotEqualTo(String value) { + addCriterion("store_address <>", value, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreAddressGreaterThan(String value) { + addCriterion("store_address >", value, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreAddressGreaterThanOrEqualTo(String value) { + addCriterion("store_address >=", value, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreAddressLessThan(String value) { + addCriterion("store_address <", value, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreAddressLessThanOrEqualTo(String value) { + addCriterion("store_address <=", value, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreAddressLike(String value) { + addCriterion("store_address like", value, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreAddressNotLike(String value) { + addCriterion("store_address not like", value, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreAddressIn(List values) { + addCriterion("store_address in", values, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreAddressNotIn(List values) { + addCriterion("store_address not in", values, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreAddressBetween(String value1, String value2) { + addCriterion("store_address between", value1, value2, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreAddressNotBetween(String value1, String value2) { + addCriterion("store_address not between", value1, value2, "storeAddress"); + return (Criteria) this; + } + + public Criteria andStoreNameIsNull() { + addCriterion("store_name is null"); + return (Criteria) this; + } + + public Criteria andStoreNameIsNotNull() { + addCriterion("store_name is not null"); + return (Criteria) this; + } + + public Criteria andStoreNameEqualTo(String value) { + addCriterion("store_name =", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameNotEqualTo(String value) { + addCriterion("store_name <>", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameGreaterThan(String value) { + addCriterion("store_name >", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameGreaterThanOrEqualTo(String value) { + addCriterion("store_name >=", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameLessThan(String value) { + addCriterion("store_name <", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameLessThanOrEqualTo(String value) { + addCriterion("store_name <=", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameLike(String value) { + addCriterion("store_name like", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameNotLike(String value) { + addCriterion("store_name not like", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameIn(List values) { + addCriterion("store_name in", values, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameNotIn(List values) { + addCriterion("store_name not in", values, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameBetween(String value1, String value2) { + addCriterion("store_name between", value1, value2, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameNotBetween(String value1, String value2) { + addCriterion("store_name not between", value1, value2, "storeName"); + return (Criteria) this; + } + public Criteria andStatusIsNull() { addCriterion("`status` is null"); return (Criteria) this;