From 10051fb82e8045d85a2ea7ec8eab683d0afed1c3 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 18 Apr 2023 18:00:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hai/dao/GoodsOrderMapper.java | 18 +-- .../com/hai/dao/GoodsOrderSqlProvider.java | 32 ++--- .../main/java/com/hai/entity/GoodsOrder.java | 36 +++--- .../com/hai/entity/GoodsOrderExample.java | 116 ++++++++++-------- 4 files changed, 111 insertions(+), 91 deletions(-) diff --git a/hai-service/src/main/java/com/hai/dao/GoodsOrderMapper.java b/hai-service/src/main/java/com/hai/dao/GoodsOrderMapper.java index b3479205..152b07da 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsOrderMapper.java @@ -40,13 +40,13 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { @Insert({ "insert into goods_order (logistics_no, sku_id, ", - "order_id, child_order_id, ", + "order_no, child_order_no, ", "delivery_address_id, create_time, ", "update_time, op_id, ", "op_name, `status`, ", "ext_1, ext_2, ext_3)", "values (#{logisticsNo,jdbcType=VARCHAR}, #{skuId,jdbcType=VARCHAR}, ", - "#{orderId,jdbcType=BIGINT}, #{childOrderId,jdbcType=BIGINT}, ", + "#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", "#{deliveryAddressId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ", "#{opName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, ", @@ -64,8 +64,8 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="logistics_no", property="logisticsNo", jdbcType=JdbcType.VARCHAR), @Result(column="sku_id", property="skuId", jdbcType=JdbcType.VARCHAR), - @Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT), - @Result(column="child_order_id", property="childOrderId", jdbcType=JdbcType.BIGINT), + @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="delivery_address_id", property="deliveryAddressId", jdbcType=JdbcType.BIGINT), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @@ -80,7 +80,7 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { @Select({ "select", - "id, logistics_no, sku_id, order_id, child_order_id, delivery_address_id, create_time, ", + "id, logistics_no, sku_id, order_no, child_order_no, delivery_address_id, create_time, ", "update_time, op_id, op_name, `status`, ext_1, ext_2, ext_3", "from goods_order", "where id = #{id,jdbcType=BIGINT}" @@ -89,8 +89,8 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="logistics_no", property="logisticsNo", jdbcType=JdbcType.VARCHAR), @Result(column="sku_id", property="skuId", jdbcType=JdbcType.VARCHAR), - @Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT), - @Result(column="child_order_id", property="childOrderId", jdbcType=JdbcType.BIGINT), + @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="delivery_address_id", property="deliveryAddressId", jdbcType=JdbcType.BIGINT), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @@ -116,8 +116,8 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { "update goods_order", "set logistics_no = #{logisticsNo,jdbcType=VARCHAR},", "sku_id = #{skuId,jdbcType=VARCHAR},", - "order_id = #{orderId,jdbcType=BIGINT},", - "child_order_id = #{childOrderId,jdbcType=BIGINT},", + "order_no = #{orderNo,jdbcType=VARCHAR},", + "child_order_no = #{childOrderNo,jdbcType=VARCHAR},", "delivery_address_id = #{deliveryAddressId,jdbcType=BIGINT},", "create_time = #{createTime,jdbcType=TIMESTAMP},", "update_time = #{updateTime,jdbcType=TIMESTAMP},", diff --git a/hai-service/src/main/java/com/hai/dao/GoodsOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/GoodsOrderSqlProvider.java index c8d68975..c5852d87 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsOrderSqlProvider.java @@ -36,12 +36,12 @@ public class GoodsOrderSqlProvider { sql.VALUES("sku_id", "#{skuId,jdbcType=VARCHAR}"); } - if (record.getOrderId() != null) { - sql.VALUES("order_id", "#{orderId,jdbcType=BIGINT}"); + if (record.getOrderNo() != null) { + sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); } - if (record.getChildOrderId() != null) { - sql.VALUES("child_order_id", "#{childOrderId,jdbcType=BIGINT}"); + if (record.getChildOrderNo() != null) { + sql.VALUES("child_order_no", "#{childOrderNo,jdbcType=VARCHAR}"); } if (record.getDeliveryAddressId() != null) { @@ -92,8 +92,8 @@ public class GoodsOrderSqlProvider { } sql.SELECT("logistics_no"); sql.SELECT("sku_id"); - sql.SELECT("order_id"); - sql.SELECT("child_order_id"); + sql.SELECT("order_no"); + sql.SELECT("child_order_no"); sql.SELECT("delivery_address_id"); sql.SELECT("create_time"); sql.SELECT("update_time"); @@ -132,12 +132,12 @@ public class GoodsOrderSqlProvider { sql.SET("sku_id = #{record.skuId,jdbcType=VARCHAR}"); } - if (record.getOrderId() != null) { - sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}"); + if (record.getOrderNo() != null) { + sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); } - if (record.getChildOrderId() != null) { - sql.SET("child_order_id = #{record.childOrderId,jdbcType=BIGINT}"); + if (record.getChildOrderNo() != null) { + sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); } if (record.getDeliveryAddressId() != null) { @@ -187,8 +187,8 @@ public class GoodsOrderSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("logistics_no = #{record.logisticsNo,jdbcType=VARCHAR}"); sql.SET("sku_id = #{record.skuId,jdbcType=VARCHAR}"); - sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}"); - sql.SET("child_order_id = #{record.childOrderId,jdbcType=BIGINT}"); + sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); + sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); sql.SET("delivery_address_id = #{record.deliveryAddressId,jdbcType=BIGINT}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); @@ -216,12 +216,12 @@ public class GoodsOrderSqlProvider { sql.SET("sku_id = #{skuId,jdbcType=VARCHAR}"); } - if (record.getOrderId() != null) { - sql.SET("order_id = #{orderId,jdbcType=BIGINT}"); + if (record.getOrderNo() != null) { + sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); } - if (record.getChildOrderId() != null) { - sql.SET("child_order_id = #{childOrderId,jdbcType=BIGINT}"); + if (record.getChildOrderNo() != null) { + sql.SET("child_order_no = #{childOrderNo,jdbcType=VARCHAR}"); } if (record.getDeliveryAddressId() != null) { diff --git a/hai-service/src/main/java/com/hai/entity/GoodsOrder.java b/hai-service/src/main/java/com/hai/entity/GoodsOrder.java index eeb4ccf5..1fdf1b7c 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsOrder.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsOrder.java @@ -29,14 +29,14 @@ public class GoodsOrder implements Serializable { private String skuId; /** - * 订单编码 + * 订单号 */ - private Long orderId; + private String orderNo; /** - * 子订单编码 + * 子订单号 */ - private Long childOrderId; + private String childOrderNo; /** * 收货地址编码 @@ -109,20 +109,20 @@ public class GoodsOrder implements Serializable { this.skuId = skuId; } - public Long getOrderId() { - return orderId; + public String getOrderNo() { + return orderNo; } - public void setOrderId(Long orderId) { - this.orderId = orderId; + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; } - public Long getChildOrderId() { - return childOrderId; + public String getChildOrderNo() { + return childOrderNo; } - public void setChildOrderId(Long childOrderId) { - this.childOrderId = childOrderId; + public void setChildOrderNo(String childOrderNo) { + this.childOrderNo = childOrderNo; } public Long getDeliveryAddressId() { @@ -212,8 +212,8 @@ public class GoodsOrder implements Serializable { return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getLogisticsNo() == null ? other.getLogisticsNo() == null : this.getLogisticsNo().equals(other.getLogisticsNo())) && (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId())) - && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId())) - && (this.getChildOrderId() == null ? other.getChildOrderId() == null : this.getChildOrderId().equals(other.getChildOrderId())) + && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) + && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) && (this.getDeliveryAddressId() == null ? other.getDeliveryAddressId() == null : this.getDeliveryAddressId().equals(other.getDeliveryAddressId())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) @@ -232,8 +232,8 @@ public class GoodsOrder implements Serializable { result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getLogisticsNo() == null) ? 0 : getLogisticsNo().hashCode()); result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode()); - result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode()); - result = prime * result + ((getChildOrderId() == null) ? 0 : getChildOrderId().hashCode()); + result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); + result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode()); result = prime * result + ((getDeliveryAddressId() == null) ? 0 : getDeliveryAddressId().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); @@ -255,8 +255,8 @@ public class GoodsOrder implements Serializable { sb.append(", id=").append(id); sb.append(", logisticsNo=").append(logisticsNo); sb.append(", skuId=").append(skuId); - sb.append(", orderId=").append(orderId); - sb.append(", childOrderId=").append(childOrderId); + sb.append(", orderNo=").append(orderNo); + sb.append(", childOrderNo=").append(childOrderNo); sb.append(", deliveryAddressId=").append(deliveryAddressId); sb.append(", createTime=").append(createTime); sb.append(", updateTime=").append(updateTime); diff --git a/hai-service/src/main/java/com/hai/entity/GoodsOrderExample.java b/hai-service/src/main/java/com/hai/entity/GoodsOrderExample.java index 628ed052..be8b1c61 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsOrderExample.java @@ -325,123 +325,143 @@ public class GoodsOrderExample { return (Criteria) this; } - public Criteria andOrderIdIsNull() { - addCriterion("order_id is null"); + public Criteria andOrderNoIsNull() { + addCriterion("order_no is null"); return (Criteria) this; } - public Criteria andOrderIdIsNotNull() { - addCriterion("order_id is not null"); + public Criteria andOrderNoIsNotNull() { + addCriterion("order_no is not null"); return (Criteria) this; } - public Criteria andOrderIdEqualTo(Long value) { - addCriterion("order_id =", value, "orderId"); + public Criteria andOrderNoEqualTo(String value) { + addCriterion("order_no =", value, "orderNo"); return (Criteria) this; } - public Criteria andOrderIdNotEqualTo(Long value) { - addCriterion("order_id <>", value, "orderId"); + public Criteria andOrderNoNotEqualTo(String value) { + addCriterion("order_no <>", value, "orderNo"); return (Criteria) this; } - public Criteria andOrderIdGreaterThan(Long value) { - addCriterion("order_id >", value, "orderId"); + public Criteria andOrderNoGreaterThan(String value) { + addCriterion("order_no >", value, "orderNo"); return (Criteria) this; } - public Criteria andOrderIdGreaterThanOrEqualTo(Long value) { - addCriterion("order_id >=", value, "orderId"); + public Criteria andOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("order_no >=", value, "orderNo"); return (Criteria) this; } - public Criteria andOrderIdLessThan(Long value) { - addCriterion("order_id <", value, "orderId"); + public Criteria andOrderNoLessThan(String value) { + addCriterion("order_no <", value, "orderNo"); return (Criteria) this; } - public Criteria andOrderIdLessThanOrEqualTo(Long value) { - addCriterion("order_id <=", value, "orderId"); + public Criteria andOrderNoLessThanOrEqualTo(String value) { + addCriterion("order_no <=", value, "orderNo"); return (Criteria) this; } - public Criteria andOrderIdIn(List values) { - addCriterion("order_id in", values, "orderId"); + public Criteria andOrderNoLike(String value) { + addCriterion("order_no like", value, "orderNo"); return (Criteria) this; } - public Criteria andOrderIdNotIn(List values) { - addCriterion("order_id not in", values, "orderId"); + public Criteria andOrderNoNotLike(String value) { + addCriterion("order_no not like", value, "orderNo"); return (Criteria) this; } - public Criteria andOrderIdBetween(Long value1, Long value2) { - addCriterion("order_id between", value1, value2, "orderId"); + public Criteria andOrderNoIn(List values) { + addCriterion("order_no in", values, "orderNo"); return (Criteria) this; } - public Criteria andOrderIdNotBetween(Long value1, Long value2) { - addCriterion("order_id not between", value1, value2, "orderId"); + public Criteria andOrderNoNotIn(List values) { + addCriterion("order_no not in", values, "orderNo"); return (Criteria) this; } - public Criteria andChildOrderIdIsNull() { - addCriterion("child_order_id is null"); + public Criteria andOrderNoBetween(String value1, String value2) { + addCriterion("order_no between", value1, value2, "orderNo"); return (Criteria) this; } - public Criteria andChildOrderIdIsNotNull() { - addCriterion("child_order_id is not null"); + public Criteria andOrderNoNotBetween(String value1, String value2) { + addCriterion("order_no not between", value1, value2, "orderNo"); return (Criteria) this; } - public Criteria andChildOrderIdEqualTo(Long value) { - addCriterion("child_order_id =", value, "childOrderId"); + public Criteria andChildOrderNoIsNull() { + addCriterion("child_order_no is null"); return (Criteria) this; } - public Criteria andChildOrderIdNotEqualTo(Long value) { - addCriterion("child_order_id <>", value, "childOrderId"); + public Criteria andChildOrderNoIsNotNull() { + addCriterion("child_order_no is not null"); return (Criteria) this; } - public Criteria andChildOrderIdGreaterThan(Long value) { - addCriterion("child_order_id >", value, "childOrderId"); + public Criteria andChildOrderNoEqualTo(String value) { + addCriterion("child_order_no =", value, "childOrderNo"); return (Criteria) this; } - public Criteria andChildOrderIdGreaterThanOrEqualTo(Long value) { - addCriterion("child_order_id >=", value, "childOrderId"); + public Criteria andChildOrderNoNotEqualTo(String value) { + addCriterion("child_order_no <>", value, "childOrderNo"); return (Criteria) this; } - public Criteria andChildOrderIdLessThan(Long value) { - addCriterion("child_order_id <", value, "childOrderId"); + public Criteria andChildOrderNoGreaterThan(String value) { + addCriterion("child_order_no >", value, "childOrderNo"); return (Criteria) this; } - public Criteria andChildOrderIdLessThanOrEqualTo(Long value) { - addCriterion("child_order_id <=", value, "childOrderId"); + public Criteria andChildOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("child_order_no >=", value, "childOrderNo"); return (Criteria) this; } - public Criteria andChildOrderIdIn(List values) { - addCriterion("child_order_id in", values, "childOrderId"); + public Criteria andChildOrderNoLessThan(String value) { + addCriterion("child_order_no <", value, "childOrderNo"); return (Criteria) this; } - public Criteria andChildOrderIdNotIn(List values) { - addCriterion("child_order_id not in", values, "childOrderId"); + public Criteria andChildOrderNoLessThanOrEqualTo(String value) { + addCriterion("child_order_no <=", value, "childOrderNo"); return (Criteria) this; } - public Criteria andChildOrderIdBetween(Long value1, Long value2) { - addCriterion("child_order_id between", value1, value2, "childOrderId"); + public Criteria andChildOrderNoLike(String value) { + addCriterion("child_order_no like", value, "childOrderNo"); return (Criteria) this; } - public Criteria andChildOrderIdNotBetween(Long value1, Long value2) { - addCriterion("child_order_id not between", value1, value2, "childOrderId"); + public Criteria andChildOrderNoNotLike(String value) { + addCriterion("child_order_no not like", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoIn(List values) { + addCriterion("child_order_no in", values, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoNotIn(List values) { + addCriterion("child_order_no not in", values, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoBetween(String value1, String value2) { + addCriterion("child_order_no between", value1, value2, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoNotBetween(String value1, String value2) { + addCriterion("child_order_no not between", value1, value2, "childOrderNo"); return (Criteria) this; }