From 8fa7793090652a0327dbc6df9cd9764971b3b843 Mon Sep 17 00:00:00 2001 From: YuanYe <418471657@qq.com> Date: Thu, 8 Aug 2024 11:32:40 +0800 Subject: [PATCH] 1 --- .../com/hfkj/dao/BsOrderStarbucksMapper.java | 19 +++--- .../hfkj/dao/BsOrderStarbucksSqlProvider.java | 14 +++++ .../com/hfkj/entity/BsOrderStarbucks.java | 13 ++++ .../hfkj/entity/BsOrderStarbucksExample.java | 60 +++++++++++++++++++ 4 files changed, 99 insertions(+), 7 deletions(-) diff --git a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java index 6827796..4f6a741 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java @@ -48,9 +48,10 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { "child_order_no, mer_id, ", "user_id, user_phone, ", "price, store_address, ", - "store_name, `status`, ", - "create_time, update_time, ", - "ext_1, ext_2, ext_3)", + "store_name, pay_type, ", + "`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}, ", @@ -60,9 +61,10 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { "#{childOrderNo,jdbcType=VARCHAR}, #{merId,jdbcType=BIGINT}, ", "#{userId,jdbcType=BIGINT}, #{userPhone,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})" + "#{storeName,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", + "#{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); @@ -94,6 +96,7 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { @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="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @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), @@ -107,7 +110,7 @@ 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, store_address, store_name, `status`, create_time, ", + "user_id, user_phone, price, store_address, store_name, pay_type, `status`, create_time, ", "update_time, ext_1, ext_2, ext_3", "from bs_order_starbucks", "where id = #{id,jdbcType=BIGINT}" @@ -134,6 +137,7 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { @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="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @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), @@ -174,6 +178,7 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { "price = #{price,jdbcType=DECIMAL},", "store_address = #{storeAddress,jdbcType=VARCHAR},", "store_name = #{storeName,jdbcType=VARCHAR},", + "pay_type = #{payType,jdbcType=INTEGER},", "`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 d27773b..e4490fd 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java @@ -108,6 +108,10 @@ public class BsOrderStarbucksSqlProvider { sql.VALUES("store_name", "#{storeName,jdbcType=VARCHAR}"); } + if (record.getPayType() != null) { + sql.VALUES("pay_type", "#{payType,jdbcType=INTEGER}"); + } + if (record.getStatus() != null) { sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } @@ -162,6 +166,7 @@ public class BsOrderStarbucksSqlProvider { sql.SELECT("price"); sql.SELECT("store_address"); sql.SELECT("store_name"); + sql.SELECT("pay_type"); sql.SELECT("`status`"); sql.SELECT("create_time"); sql.SELECT("update_time"); @@ -269,6 +274,10 @@ public class BsOrderStarbucksSqlProvider { sql.SET("store_name = #{record.storeName,jdbcType=VARCHAR}"); } + if (record.getPayType() != null) { + sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); + } + if (record.getStatus() != null) { sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } @@ -322,6 +331,7 @@ public class BsOrderStarbucksSqlProvider { 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("pay_type = #{record.payType,jdbcType=INTEGER}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); @@ -418,6 +428,10 @@ public class BsOrderStarbucksSqlProvider { sql.SET("store_name = #{storeName,jdbcType=VARCHAR}"); } + if (record.getPayType() != null) { + sql.SET("pay_type = #{payType,jdbcType=INTEGER}"); + } + 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 76df71d..4851d73 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java @@ -62,6 +62,8 @@ public class BsOrderStarbucks implements Serializable { */ private String storeName; + private Integer payType; + private Integer status; private Date createTime; @@ -244,6 +246,14 @@ public class BsOrderStarbucks implements Serializable { this.storeName = storeName; } + public Integer getPayType() { + return payType; + } + + public void setPayType(Integer payType) { + this.payType = payType; + } + public Integer getStatus() { return status; } @@ -325,6 +335,7 @@ public class BsOrderStarbucks implements Serializable { && (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.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType())) && (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())) @@ -358,6 +369,7 @@ public class BsOrderStarbucks implements Serializable { 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 + ((getPayType() == null) ? 0 : getPayType().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()); @@ -394,6 +406,7 @@ public class BsOrderStarbucks implements Serializable { sb.append(", price=").append(price); sb.append(", storeAddress=").append(storeAddress); sb.append(", storeName=").append(storeName); + sb.append(", payType=").append(payType); 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 8589c50..ab1d896 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java @@ -1536,6 +1536,66 @@ public class BsOrderStarbucksExample { return (Criteria) this; } + public Criteria andPayTypeIsNull() { + addCriterion("pay_type is null"); + return (Criteria) this; + } + + public Criteria andPayTypeIsNotNull() { + addCriterion("pay_type is not null"); + return (Criteria) this; + } + + public Criteria andPayTypeEqualTo(Integer value) { + addCriterion("pay_type =", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeNotEqualTo(Integer value) { + addCriterion("pay_type <>", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeGreaterThan(Integer value) { + addCriterion("pay_type >", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("pay_type >=", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeLessThan(Integer value) { + addCriterion("pay_type <", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeLessThanOrEqualTo(Integer value) { + addCriterion("pay_type <=", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeIn(List values) { + addCriterion("pay_type in", values, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeNotIn(List values) { + addCriterion("pay_type not in", values, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeBetween(Integer value1, Integer value2) { + addCriterion("pay_type between", value1, value2, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeNotBetween(Integer value1, Integer value2) { + addCriterion("pay_type not between", value1, value2, "payType"); + return (Criteria) this; + } + public Criteria andStatusIsNull() { addCriterion("`status` is null"); return (Criteria) this;