From 5272cbb5e34be747310db91eb4e89be76114573a Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Thu, 31 Mar 2022 09:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hai/dao/HighChildOrderMapper.java | 17 ++++-- .../hai/dao/HighChildOrderSqlProvider.java | 14 +++++ .../java/com/hai/entity/HighChildOrder.java | 20 ++++++- .../com/hai/entity/HighChildOrderExample.java | 60 +++++++++++++++++++ 4 files changed, 103 insertions(+), 8 deletions(-) diff --git a/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java b/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java index 99f2fcf2..64d7d91c 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java @@ -51,8 +51,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "gas_oil_no, gas_gun_no, ", "gas_oil_type, gas_order_no, ", "gas_price_gun, gas_price_vip, ", - "ext_1, ext_2, ext_3, ", - "ext_4, ext_5, ext_6)", + "gas_salesman_id, ext_1, ", + "ext_2, ext_3, ext_4, ", + "ext_5, ext_6)", "values (#{orderId,jdbcType=BIGINT}, #{memId,jdbcType=BIGINT}, ", "#{storeId,jdbcType=BIGINT}, #{storeName,jdbcType=VARCHAR}, ", "#{storeAddress,jdbcType=VARCHAR}, #{goodsType,jdbcType=INTEGER}, ", @@ -65,8 +66,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "#{gasOilNo,jdbcType=VARCHAR}, #{gasGunNo,jdbcType=VARCHAR}, ", "#{gasOilType,jdbcType=INTEGER}, #{gasOrderNo,jdbcType=VARCHAR}, ", "#{gasPriceGun,jdbcType=DECIMAL}, #{gasPriceVip,jdbcType=DECIMAL}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, ", - "#{ext4,jdbcType=VARCHAR}, #{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})" + "#{gasSalesmanId,jdbcType=BIGINT}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, #{ext4,jdbcType=VARCHAR}, ", + "#{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighChildOrder record); @@ -102,6 +104,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="gas_order_no", property="gasOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="gas_price_gun", property="gasPriceGun", jdbcType=JdbcType.DECIMAL), @Result(column="gas_price_vip", property="gasPriceVip", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_salesman_id", property="gasSalesmanId", jdbcType=JdbcType.BIGINT), @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), @@ -116,8 +119,8 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "id, order_id, mem_id, store_id, store_name, store_address, goods_type, goods_id, ", "goods_name, goods_desc, goods_img, goods_spec_name, goods_price, goods_actual_price, ", "sale_count, total_price, giveaway_type, child_orde_status, praise_status, gas_oil_no, ", - "gas_gun_no, gas_oil_type, gas_order_no, gas_price_gun, gas_price_vip, ext_1, ", - "ext_2, ext_3, ext_4, ext_5, ext_6", + "gas_gun_no, gas_oil_type, gas_order_no, gas_price_gun, gas_price_vip, gas_salesman_id, ", + "ext_1, ext_2, ext_3, ext_4, ext_5, ext_6", "from high_child_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -147,6 +150,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="gas_order_no", property="gasOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="gas_price_gun", property="gasPriceGun", jdbcType=JdbcType.DECIMAL), @Result(column="gas_price_vip", property="gasPriceVip", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_salesman_id", property="gasSalesmanId", jdbcType=JdbcType.BIGINT), @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), @@ -191,6 +195,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "gas_order_no = #{gasOrderNo,jdbcType=VARCHAR},", "gas_price_gun = #{gasPriceGun,jdbcType=DECIMAL},", "gas_price_vip = #{gasPriceVip,jdbcType=DECIMAL},", + "gas_salesman_id = #{gasSalesmanId,jdbcType=BIGINT},", "ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},", "ext_3 = #{ext3,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java index 036c1116..ac75b8ca 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java @@ -124,6 +124,10 @@ public class HighChildOrderSqlProvider { sql.VALUES("gas_price_vip", "#{gasPriceVip,jdbcType=DECIMAL}"); } + if (record.getGasSalesmanId() != null) { + sql.VALUES("gas_salesman_id", "#{gasSalesmanId,jdbcType=BIGINT}"); + } + if (record.getExt1() != null) { sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); } @@ -182,6 +186,7 @@ public class HighChildOrderSqlProvider { sql.SELECT("gas_order_no"); sql.SELECT("gas_price_gun"); sql.SELECT("gas_price_vip"); + sql.SELECT("gas_salesman_id"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); sql.SELECT("ext_3"); @@ -305,6 +310,10 @@ public class HighChildOrderSqlProvider { sql.SET("gas_price_vip = #{record.gasPriceVip,jdbcType=DECIMAL}"); } + if (record.getGasSalesmanId() != null) { + sql.SET("gas_salesman_id = #{record.gasSalesmanId,jdbcType=BIGINT}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); } @@ -362,6 +371,7 @@ public class HighChildOrderSqlProvider { sql.SET("gas_order_no = #{record.gasOrderNo,jdbcType=VARCHAR}"); sql.SET("gas_price_gun = #{record.gasPriceGun,jdbcType=DECIMAL}"); sql.SET("gas_price_vip = #{record.gasPriceVip,jdbcType=DECIMAL}"); + sql.SET("gas_salesman_id = #{record.gasSalesmanId,jdbcType=BIGINT}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); @@ -474,6 +484,10 @@ public class HighChildOrderSqlProvider { sql.SET("gas_price_vip = #{gasPriceVip,jdbcType=DECIMAL}"); } + if (record.getGasSalesmanId() != null) { + sql.SET("gas_salesman_id = #{gasSalesmanId,jdbcType=BIGINT}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); } diff --git a/hai-service/src/main/java/com/hai/entity/HighChildOrder.java b/hai-service/src/main/java/com/hai/entity/HighChildOrder.java index ffc657a7..4e41d75f 100644 --- a/hai-service/src/main/java/com/hai/entity/HighChildOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighChildOrder.java @@ -44,7 +44,7 @@ public class HighChildOrder implements Serializable { private String storeAddress; /** - * 商品类型 1:卡卷 2:金币充值 3:团油【加油站】 4: KFC 5：电影票 8: 汇联通充值 + * 商品类型 1:卡卷 2:金币充值 3:团油【加油站】 4: KFC 5：电影票 6：话费充值 7：优惠卷包 8：汇联通充值 */ private Integer goodsType; @@ -138,6 +138,11 @@ public class HighChildOrder implements Serializable { */ private BigDecimal gasPriceVip; + /** + * 【加油站】业务员id + */ + private Long gasSalesmanId; + private String ext1; private String ext2; @@ -352,6 +357,14 @@ public class HighChildOrder implements Serializable { this.gasPriceVip = gasPriceVip; } + public Long getGasSalesmanId() { + return gasSalesmanId; + } + + public void setGasSalesmanId(Long gasSalesmanId) { + this.gasSalesmanId = gasSalesmanId; + } + public String getExt1() { return ext1; } @@ -437,6 +450,7 @@ public class HighChildOrder implements Serializable { && (this.getGasOrderNo() == null ? other.getGasOrderNo() == null : this.getGasOrderNo().equals(other.getGasOrderNo())) && (this.getGasPriceGun() == null ? other.getGasPriceGun() == null : this.getGasPriceGun().equals(other.getGasPriceGun())) && (this.getGasPriceVip() == null ? other.getGasPriceVip() == null : this.getGasPriceVip().equals(other.getGasPriceVip())) + && (this.getGasSalesmanId() == null ? other.getGasSalesmanId() == null : this.getGasSalesmanId().equals(other.getGasSalesmanId())) && (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())) @@ -474,6 +488,7 @@ public class HighChildOrder implements Serializable { result = prime * result + ((getGasOrderNo() == null) ? 0 : getGasOrderNo().hashCode()); result = prime * result + ((getGasPriceGun() == null) ? 0 : getGasPriceGun().hashCode()); result = prime * result + ((getGasPriceVip() == null) ? 0 : getGasPriceVip().hashCode()); + result = prime * result + ((getGasSalesmanId() == null) ? 0 : getGasSalesmanId().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()); @@ -514,6 +529,7 @@ public class HighChildOrder implements Serializable { sb.append(", gasOrderNo=").append(gasOrderNo); sb.append(", gasPriceGun=").append(gasPriceGun); sb.append(", gasPriceVip=").append(gasPriceVip); + sb.append(", gasSalesmanId=").append(gasSalesmanId); sb.append(", ext1=").append(ext1); sb.append(", ext2=").append(ext2); sb.append(", ext3=").append(ext3); @@ -524,4 +540,4 @@ public class HighChildOrder implements Serializable { sb.append("]"); return sb.toString(); } -} +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java b/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java index 991466c0..72b0edf3 100644 --- a/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java @@ -1715,6 +1715,66 @@ public class HighChildOrderExample { return (Criteria) this; } + public Criteria andGasSalesmanIdIsNull() { + addCriterion("gas_salesman_id is null"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdIsNotNull() { + addCriterion("gas_salesman_id is not null"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdEqualTo(Long value) { + addCriterion("gas_salesman_id =", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdNotEqualTo(Long value) { + addCriterion("gas_salesman_id <>", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdGreaterThan(Long value) { + addCriterion("gas_salesman_id >", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdGreaterThanOrEqualTo(Long value) { + addCriterion("gas_salesman_id >=", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdLessThan(Long value) { + addCriterion("gas_salesman_id <", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdLessThanOrEqualTo(Long value) { + addCriterion("gas_salesman_id <=", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdIn(List values) { + addCriterion("gas_salesman_id in", values, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdNotIn(List values) { + addCriterion("gas_salesman_id not in", values, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdBetween(Long value1, Long value2) { + addCriterion("gas_salesman_id between", value1, value2, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdNotBetween(Long value1, Long value2) { + addCriterion("gas_salesman_id not between", value1, value2, "gasSalesmanId"); + return (Criteria) this; + } + public Criteria andExt1IsNull() { addCriterion("ext_1 is null"); return (Criteria) this;