提交代码

new-dev
胡锐 2 years ago
parent 33d89c0eb4
commit 10051fb82e
  1. 18
      hai-service/src/main/java/com/hai/dao/GoodsOrderMapper.java
  2. 32
      hai-service/src/main/java/com/hai/dao/GoodsOrderSqlProvider.java
  3. 36
      hai-service/src/main/java/com/hai/entity/GoodsOrder.java
  4. 116
      hai-service/src/main/java/com/hai/entity/GoodsOrderExample.java

@ -40,13 +40,13 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt {
@Insert({ @Insert({
"insert into goods_order (logistics_no, sku_id, ", "insert into goods_order (logistics_no, sku_id, ",
"order_id, child_order_id, ", "order_no, child_order_no, ",
"delivery_address_id, create_time, ", "delivery_address_id, create_time, ",
"update_time, op_id, ", "update_time, op_id, ",
"op_name, `status`, ", "op_name, `status`, ",
"ext_1, ext_2, ext_3)", "ext_1, ext_2, ext_3)",
"values (#{logisticsNo,jdbcType=VARCHAR}, #{skuId,jdbcType=VARCHAR}, ", "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}, ", "#{deliveryAddressId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ",
"#{opName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, ", "#{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="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="logistics_no", property="logisticsNo", jdbcType=JdbcType.VARCHAR), @Result(column="logistics_no", property="logisticsNo", jdbcType=JdbcType.VARCHAR),
@Result(column="sku_id", property="skuId", jdbcType=JdbcType.VARCHAR), @Result(column="sku_id", property="skuId", jdbcType=JdbcType.VARCHAR),
@Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
@Result(column="child_order_id", property="childOrderId", jdbcType=JdbcType.BIGINT), @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR),
@Result(column="delivery_address_id", property="deliveryAddressId", jdbcType=JdbcType.BIGINT), @Result(column="delivery_address_id", property="deliveryAddressId", jdbcType=JdbcType.BIGINT),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@ -80,7 +80,7 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt {
@Select({ @Select({
"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", "update_time, op_id, op_name, `status`, ext_1, ext_2, ext_3",
"from goods_order", "from goods_order",
"where id = #{id,jdbcType=BIGINT}" "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="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="logistics_no", property="logisticsNo", jdbcType=JdbcType.VARCHAR), @Result(column="logistics_no", property="logisticsNo", jdbcType=JdbcType.VARCHAR),
@Result(column="sku_id", property="skuId", jdbcType=JdbcType.VARCHAR), @Result(column="sku_id", property="skuId", jdbcType=JdbcType.VARCHAR),
@Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
@Result(column="child_order_id", property="childOrderId", jdbcType=JdbcType.BIGINT), @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR),
@Result(column="delivery_address_id", property="deliveryAddressId", jdbcType=JdbcType.BIGINT), @Result(column="delivery_address_id", property="deliveryAddressId", jdbcType=JdbcType.BIGINT),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@ -116,8 +116,8 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt {
"update goods_order", "update goods_order",
"set logistics_no = #{logisticsNo,jdbcType=VARCHAR},", "set logistics_no = #{logisticsNo,jdbcType=VARCHAR},",
"sku_id = #{skuId,jdbcType=VARCHAR},", "sku_id = #{skuId,jdbcType=VARCHAR},",
"order_id = #{orderId,jdbcType=BIGINT},", "order_no = #{orderNo,jdbcType=VARCHAR},",
"child_order_id = #{childOrderId,jdbcType=BIGINT},", "child_order_no = #{childOrderNo,jdbcType=VARCHAR},",
"delivery_address_id = #{deliveryAddressId,jdbcType=BIGINT},", "delivery_address_id = #{deliveryAddressId,jdbcType=BIGINT},",
"create_time = #{createTime,jdbcType=TIMESTAMP},", "create_time = #{createTime,jdbcType=TIMESTAMP},",
"update_time = #{updateTime,jdbcType=TIMESTAMP},", "update_time = #{updateTime,jdbcType=TIMESTAMP},",

@ -36,12 +36,12 @@ public class GoodsOrderSqlProvider {
sql.VALUES("sku_id", "#{skuId,jdbcType=VARCHAR}"); sql.VALUES("sku_id", "#{skuId,jdbcType=VARCHAR}");
} }
if (record.getOrderId() != null) { if (record.getOrderNo() != null) {
sql.VALUES("order_id", "#{orderId,jdbcType=BIGINT}"); sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}");
} }
if (record.getChildOrderId() != null) { if (record.getChildOrderNo() != null) {
sql.VALUES("child_order_id", "#{childOrderId,jdbcType=BIGINT}"); sql.VALUES("child_order_no", "#{childOrderNo,jdbcType=VARCHAR}");
} }
if (record.getDeliveryAddressId() != null) { if (record.getDeliveryAddressId() != null) {
@ -92,8 +92,8 @@ public class GoodsOrderSqlProvider {
} }
sql.SELECT("logistics_no"); sql.SELECT("logistics_no");
sql.SELECT("sku_id"); sql.SELECT("sku_id");
sql.SELECT("order_id"); sql.SELECT("order_no");
sql.SELECT("child_order_id"); sql.SELECT("child_order_no");
sql.SELECT("delivery_address_id"); sql.SELECT("delivery_address_id");
sql.SELECT("create_time"); sql.SELECT("create_time");
sql.SELECT("update_time"); sql.SELECT("update_time");
@ -132,12 +132,12 @@ public class GoodsOrderSqlProvider {
sql.SET("sku_id = #{record.skuId,jdbcType=VARCHAR}"); sql.SET("sku_id = #{record.skuId,jdbcType=VARCHAR}");
} }
if (record.getOrderId() != null) { if (record.getOrderNo() != null) {
sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}"); sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
} }
if (record.getChildOrderId() != null) { if (record.getChildOrderNo() != null) {
sql.SET("child_order_id = #{record.childOrderId,jdbcType=BIGINT}"); sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}");
} }
if (record.getDeliveryAddressId() != null) { if (record.getDeliveryAddressId() != null) {
@ -187,8 +187,8 @@ public class GoodsOrderSqlProvider {
sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("logistics_no = #{record.logisticsNo,jdbcType=VARCHAR}"); sql.SET("logistics_no = #{record.logisticsNo,jdbcType=VARCHAR}");
sql.SET("sku_id = #{record.skuId,jdbcType=VARCHAR}"); sql.SET("sku_id = #{record.skuId,jdbcType=VARCHAR}");
sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}"); sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
sql.SET("child_order_id = #{record.childOrderId,jdbcType=BIGINT}"); sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}");
sql.SET("delivery_address_id = #{record.deliveryAddressId,jdbcType=BIGINT}"); sql.SET("delivery_address_id = #{record.deliveryAddressId,jdbcType=BIGINT}");
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
@ -216,12 +216,12 @@ public class GoodsOrderSqlProvider {
sql.SET("sku_id = #{skuId,jdbcType=VARCHAR}"); sql.SET("sku_id = #{skuId,jdbcType=VARCHAR}");
} }
if (record.getOrderId() != null) { if (record.getOrderNo() != null) {
sql.SET("order_id = #{orderId,jdbcType=BIGINT}"); sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}");
} }
if (record.getChildOrderId() != null) { if (record.getChildOrderNo() != null) {
sql.SET("child_order_id = #{childOrderId,jdbcType=BIGINT}"); sql.SET("child_order_no = #{childOrderNo,jdbcType=VARCHAR}");
} }
if (record.getDeliveryAddressId() != null) { if (record.getDeliveryAddressId() != null) {

@ -29,14 +29,14 @@ public class GoodsOrder implements Serializable {
private String skuId; 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; this.skuId = skuId;
} }
public Long getOrderId() { public String getOrderNo() {
return orderId; return orderNo;
} }
public void setOrderId(Long orderId) { public void setOrderNo(String orderNo) {
this.orderId = orderId; this.orderNo = orderNo;
} }
public Long getChildOrderId() { public String getChildOrderNo() {
return childOrderId; return childOrderNo;
} }
public void setChildOrderId(Long childOrderId) { public void setChildOrderNo(String childOrderNo) {
this.childOrderId = childOrderId; this.childOrderNo = childOrderNo;
} }
public Long getDeliveryAddressId() { public Long getDeliveryAddressId() {
@ -212,8 +212,8 @@ public class GoodsOrder implements Serializable {
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getLogisticsNo() == null ? other.getLogisticsNo() == null : this.getLogisticsNo().equals(other.getLogisticsNo())) && (this.getLogisticsNo() == null ? other.getLogisticsNo() == null : this.getLogisticsNo().equals(other.getLogisticsNo()))
&& (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId())) && (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId()))
&& (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId())) && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
&& (this.getChildOrderId() == null ? other.getChildOrderId() == null : this.getChildOrderId().equals(other.getChildOrderId())) && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo()))
&& (this.getDeliveryAddressId() == null ? other.getDeliveryAddressId() == null : this.getDeliveryAddressId().equals(other.getDeliveryAddressId())) && (this.getDeliveryAddressId() == null ? other.getDeliveryAddressId() == null : this.getDeliveryAddressId().equals(other.getDeliveryAddressId()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) && (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 + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getLogisticsNo() == null) ? 0 : getLogisticsNo().hashCode()); result = prime * result + ((getLogisticsNo() == null) ? 0 : getLogisticsNo().hashCode());
result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode()); result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode());
result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode()); result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
result = prime * result + ((getChildOrderId() == null) ? 0 : getChildOrderId().hashCode()); result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode());
result = prime * result + ((getDeliveryAddressId() == null) ? 0 : getDeliveryAddressId().hashCode()); result = prime * result + ((getDeliveryAddressId() == null) ? 0 : getDeliveryAddressId().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().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(", id=").append(id);
sb.append(", logisticsNo=").append(logisticsNo); sb.append(", logisticsNo=").append(logisticsNo);
sb.append(", skuId=").append(skuId); sb.append(", skuId=").append(skuId);
sb.append(", orderId=").append(orderId); sb.append(", orderNo=").append(orderNo);
sb.append(", childOrderId=").append(childOrderId); sb.append(", childOrderNo=").append(childOrderNo);
sb.append(", deliveryAddressId=").append(deliveryAddressId); sb.append(", deliveryAddressId=").append(deliveryAddressId);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime); sb.append(", updateTime=").append(updateTime);

@ -325,123 +325,143 @@ public class GoodsOrderExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdIsNull() { public Criteria andOrderNoIsNull() {
addCriterion("order_id is null"); addCriterion("order_no is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdIsNotNull() { public Criteria andOrderNoIsNotNull() {
addCriterion("order_id is not null"); addCriterion("order_no is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdEqualTo(Long value) { public Criteria andOrderNoEqualTo(String value) {
addCriterion("order_id =", value, "orderId"); addCriterion("order_no =", value, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdNotEqualTo(Long value) { public Criteria andOrderNoNotEqualTo(String value) {
addCriterion("order_id <>", value, "orderId"); addCriterion("order_no <>", value, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdGreaterThan(Long value) { public Criteria andOrderNoGreaterThan(String value) {
addCriterion("order_id >", value, "orderId"); addCriterion("order_no >", value, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdGreaterThanOrEqualTo(Long value) { public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
addCriterion("order_id >=", value, "orderId"); addCriterion("order_no >=", value, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdLessThan(Long value) { public Criteria andOrderNoLessThan(String value) {
addCriterion("order_id <", value, "orderId"); addCriterion("order_no <", value, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdLessThanOrEqualTo(Long value) { public Criteria andOrderNoLessThanOrEqualTo(String value) {
addCriterion("order_id <=", value, "orderId"); addCriterion("order_no <=", value, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdIn(List<Long> values) { public Criteria andOrderNoLike(String value) {
addCriterion("order_id in", values, "orderId"); addCriterion("order_no like", value, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdNotIn(List<Long> values) { public Criteria andOrderNoNotLike(String value) {
addCriterion("order_id not in", values, "orderId"); addCriterion("order_no not like", value, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdBetween(Long value1, Long value2) { public Criteria andOrderNoIn(List<String> values) {
addCriterion("order_id between", value1, value2, "orderId"); addCriterion("order_no in", values, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOrderIdNotBetween(Long value1, Long value2) { public Criteria andOrderNoNotIn(List<String> values) {
addCriterion("order_id not between", value1, value2, "orderId"); addCriterion("order_no not in", values, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdIsNull() { public Criteria andOrderNoBetween(String value1, String value2) {
addCriterion("child_order_id is null"); addCriterion("order_no between", value1, value2, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdIsNotNull() { public Criteria andOrderNoNotBetween(String value1, String value2) {
addCriterion("child_order_id is not null"); addCriterion("order_no not between", value1, value2, "orderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdEqualTo(Long value) { public Criteria andChildOrderNoIsNull() {
addCriterion("child_order_id =", value, "childOrderId"); addCriterion("child_order_no is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdNotEqualTo(Long value) { public Criteria andChildOrderNoIsNotNull() {
addCriterion("child_order_id <>", value, "childOrderId"); addCriterion("child_order_no is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdGreaterThan(Long value) { public Criteria andChildOrderNoEqualTo(String value) {
addCriterion("child_order_id >", value, "childOrderId"); addCriterion("child_order_no =", value, "childOrderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdGreaterThanOrEqualTo(Long value) { public Criteria andChildOrderNoNotEqualTo(String value) {
addCriterion("child_order_id >=", value, "childOrderId"); addCriterion("child_order_no <>", value, "childOrderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdLessThan(Long value) { public Criteria andChildOrderNoGreaterThan(String value) {
addCriterion("child_order_id <", value, "childOrderId"); addCriterion("child_order_no >", value, "childOrderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdLessThanOrEqualTo(Long value) { public Criteria andChildOrderNoGreaterThanOrEqualTo(String value) {
addCriterion("child_order_id <=", value, "childOrderId"); addCriterion("child_order_no >=", value, "childOrderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdIn(List<Long> values) { public Criteria andChildOrderNoLessThan(String value) {
addCriterion("child_order_id in", values, "childOrderId"); addCriterion("child_order_no <", value, "childOrderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdNotIn(List<Long> values) { public Criteria andChildOrderNoLessThanOrEqualTo(String value) {
addCriterion("child_order_id not in", values, "childOrderId"); addCriterion("child_order_no <=", value, "childOrderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdBetween(Long value1, Long value2) { public Criteria andChildOrderNoLike(String value) {
addCriterion("child_order_id between", value1, value2, "childOrderId"); addCriterion("child_order_no like", value, "childOrderNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChildOrderIdNotBetween(Long value1, Long value2) { public Criteria andChildOrderNoNotLike(String value) {
addCriterion("child_order_id not between", value1, value2, "childOrderId"); addCriterion("child_order_no not like", value, "childOrderNo");
return (Criteria) this;
}
public Criteria andChildOrderNoIn(List<String> values) {
addCriterion("child_order_no in", values, "childOrderNo");
return (Criteria) this;
}
public Criteria andChildOrderNoNotIn(List<String> 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; return (Criteria) this;
} }

Loading…
Cancel
Save