From fc3e9728568e81041ac93f6daae6cbe119c2201c Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 18 Apr 2023 18:41:31 +0800 Subject: [PATCH] Changes --- .../java/com/hai/dao/GoodsOrderMapper.java | 25 +- .../com/hai/dao/GoodsOrderSqlProvider.java | 56 ++++ .../main/java/com/hai/entity/GoodsOrder.java | 65 +++++ .../com/hai/entity/GoodsOrderExample.java | 251 ++++++++++++++++++ private-rsa.key | 27 -- rsa.pem | 0 6 files changed, 393 insertions(+), 31 deletions(-) delete mode 100644 private-rsa.key delete mode 100644 rsa.pem 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 152b07da..aaca3311 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsOrderMapper.java @@ -41,13 +41,17 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { @Insert({ "insert into goods_order (logistics_no, sku_id, ", "order_no, child_order_no, ", - "delivery_address_id, create_time, ", + "pay_price, order_price, ", + "freight_price, delivery_address_id, ", + "delivery_address, create_time, ", "update_time, op_id, ", "op_name, `status`, ", "ext_1, ext_2, ext_3)", "values (#{logisticsNo,jdbcType=VARCHAR}, #{skuId,jdbcType=VARCHAR}, ", "#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", - "#{deliveryAddressId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{payPrice,jdbcType=DECIMAL}, #{orderPrice,jdbcType=DECIMAL}, ", + "#{freightPrice,jdbcType=DECIMAL}, #{deliveryAddressId,jdbcType=BIGINT}, ", + "#{deliveryAddress,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ", "#{opName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" @@ -66,7 +70,11 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { @Result(column="sku_id", property="skuId", jdbcType=JdbcType.VARCHAR), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="freight_price", property="freightPrice", jdbcType=JdbcType.DECIMAL), @Result(column="delivery_address_id", property="deliveryAddressId", jdbcType=JdbcType.BIGINT), + @Result(column="delivery_address", property="deliveryAddress", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT), @@ -80,8 +88,9 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { @Select({ "select", - "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", + "id, logistics_no, sku_id, order_no, child_order_no, pay_price, order_price, ", + "freight_price, delivery_address_id, delivery_address, create_time, update_time, ", + "op_id, op_name, `status`, ext_1, ext_2, ext_3", "from goods_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -91,7 +100,11 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { @Result(column="sku_id", property="skuId", jdbcType=JdbcType.VARCHAR), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="freight_price", property="freightPrice", jdbcType=JdbcType.DECIMAL), @Result(column="delivery_address_id", property="deliveryAddressId", jdbcType=JdbcType.BIGINT), + @Result(column="delivery_address", property="deliveryAddress", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT), @@ -118,7 +131,11 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { "sku_id = #{skuId,jdbcType=VARCHAR},", "order_no = #{orderNo,jdbcType=VARCHAR},", "child_order_no = #{childOrderNo,jdbcType=VARCHAR},", + "pay_price = #{payPrice,jdbcType=DECIMAL},", + "order_price = #{orderPrice,jdbcType=DECIMAL},", + "freight_price = #{freightPrice,jdbcType=DECIMAL},", "delivery_address_id = #{deliveryAddressId,jdbcType=BIGINT},", + "delivery_address = #{deliveryAddress,jdbcType=VARCHAR},", "create_time = #{createTime,jdbcType=TIMESTAMP},", "update_time = #{updateTime,jdbcType=TIMESTAMP},", "op_id = #{opId,jdbcType=BIGINT},", 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 c5852d87..45660df1 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsOrderSqlProvider.java @@ -44,10 +44,26 @@ public class GoodsOrderSqlProvider { sql.VALUES("child_order_no", "#{childOrderNo,jdbcType=VARCHAR}"); } + if (record.getPayPrice() != null) { + sql.VALUES("pay_price", "#{payPrice,jdbcType=DECIMAL}"); + } + + if (record.getOrderPrice() != null) { + sql.VALUES("order_price", "#{orderPrice,jdbcType=DECIMAL}"); + } + + if (record.getFreightPrice() != null) { + sql.VALUES("freight_price", "#{freightPrice,jdbcType=DECIMAL}"); + } + if (record.getDeliveryAddressId() != null) { sql.VALUES("delivery_address_id", "#{deliveryAddressId,jdbcType=BIGINT}"); } + if (record.getDeliveryAddress() != null) { + sql.VALUES("delivery_address", "#{deliveryAddress,jdbcType=VARCHAR}"); + } + if (record.getCreateTime() != null) { sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); } @@ -94,7 +110,11 @@ public class GoodsOrderSqlProvider { sql.SELECT("sku_id"); sql.SELECT("order_no"); sql.SELECT("child_order_no"); + sql.SELECT("pay_price"); + sql.SELECT("order_price"); + sql.SELECT("freight_price"); sql.SELECT("delivery_address_id"); + sql.SELECT("delivery_address"); sql.SELECT("create_time"); sql.SELECT("update_time"); sql.SELECT("op_id"); @@ -140,10 +160,26 @@ public class GoodsOrderSqlProvider { sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); } + if (record.getPayPrice() != null) { + sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}"); + } + + if (record.getOrderPrice() != null) { + sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); + } + + if (record.getFreightPrice() != null) { + sql.SET("freight_price = #{record.freightPrice,jdbcType=DECIMAL}"); + } + if (record.getDeliveryAddressId() != null) { sql.SET("delivery_address_id = #{record.deliveryAddressId,jdbcType=BIGINT}"); } + if (record.getDeliveryAddress() != null) { + sql.SET("delivery_address = #{record.deliveryAddress,jdbcType=VARCHAR}"); + } + if (record.getCreateTime() != null) { sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); } @@ -189,7 +225,11 @@ public class GoodsOrderSqlProvider { sql.SET("sku_id = #{record.skuId,jdbcType=VARCHAR}"); sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); + sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}"); + sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); + sql.SET("freight_price = #{record.freightPrice,jdbcType=DECIMAL}"); sql.SET("delivery_address_id = #{record.deliveryAddressId,jdbcType=BIGINT}"); + sql.SET("delivery_address = #{record.deliveryAddress,jdbcType=VARCHAR}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); sql.SET("op_id = #{record.opId,jdbcType=BIGINT}"); @@ -224,10 +264,26 @@ public class GoodsOrderSqlProvider { sql.SET("child_order_no = #{childOrderNo,jdbcType=VARCHAR}"); } + if (record.getPayPrice() != null) { + sql.SET("pay_price = #{payPrice,jdbcType=DECIMAL}"); + } + + if (record.getOrderPrice() != null) { + sql.SET("order_price = #{orderPrice,jdbcType=DECIMAL}"); + } + + if (record.getFreightPrice() != null) { + sql.SET("freight_price = #{freightPrice,jdbcType=DECIMAL}"); + } + if (record.getDeliveryAddressId() != null) { sql.SET("delivery_address_id = #{deliveryAddressId,jdbcType=BIGINT}"); } + if (record.getDeliveryAddress() != null) { + sql.SET("delivery_address = #{deliveryAddress,jdbcType=VARCHAR}"); + } + if (record.getCreateTime() != null) { sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); } 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 1fdf1b7c..020b8212 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsOrder.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsOrder.java @@ -1,6 +1,7 @@ package com.hai.entity; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -38,11 +39,31 @@ public class GoodsOrder implements Serializable { */ private String childOrderNo; + /** + * 支付金额 + */ + private BigDecimal payPrice; + + /** + * 订单金额 + */ + private BigDecimal orderPrice; + + /** + * 运费 + */ + private BigDecimal freightPrice; + /** * 收货地址编码 */ private Long deliveryAddressId; + /** + * 收货地址 + */ + private String deliveryAddress; + /** * 创建时间 */ @@ -125,6 +146,30 @@ public class GoodsOrder implements Serializable { this.childOrderNo = childOrderNo; } + public BigDecimal getPayPrice() { + return payPrice; + } + + public void setPayPrice(BigDecimal payPrice) { + this.payPrice = payPrice; + } + + public BigDecimal getOrderPrice() { + return orderPrice; + } + + public void setOrderPrice(BigDecimal orderPrice) { + this.orderPrice = orderPrice; + } + + public BigDecimal getFreightPrice() { + return freightPrice; + } + + public void setFreightPrice(BigDecimal freightPrice) { + this.freightPrice = freightPrice; + } + public Long getDeliveryAddressId() { return deliveryAddressId; } @@ -133,6 +178,14 @@ public class GoodsOrder implements Serializable { this.deliveryAddressId = deliveryAddressId; } + public String getDeliveryAddress() { + return deliveryAddress; + } + + public void setDeliveryAddress(String deliveryAddress) { + this.deliveryAddress = deliveryAddress; + } + public Date getCreateTime() { return createTime; } @@ -214,7 +267,11 @@ public class GoodsOrder implements Serializable { && (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId())) && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) + && (this.getPayPrice() == null ? other.getPayPrice() == null : this.getPayPrice().equals(other.getPayPrice())) + && (this.getOrderPrice() == null ? other.getOrderPrice() == null : this.getOrderPrice().equals(other.getOrderPrice())) + && (this.getFreightPrice() == null ? other.getFreightPrice() == null : this.getFreightPrice().equals(other.getFreightPrice())) && (this.getDeliveryAddressId() == null ? other.getDeliveryAddressId() == null : this.getDeliveryAddressId().equals(other.getDeliveryAddressId())) + && (this.getDeliveryAddress() == null ? other.getDeliveryAddress() == null : this.getDeliveryAddress().equals(other.getDeliveryAddress())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) && (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId())) @@ -234,7 +291,11 @@ public class GoodsOrder implements Serializable { result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode()); result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode()); + result = prime * result + ((getPayPrice() == null) ? 0 : getPayPrice().hashCode()); + result = prime * result + ((getOrderPrice() == null) ? 0 : getOrderPrice().hashCode()); + result = prime * result + ((getFreightPrice() == null) ? 0 : getFreightPrice().hashCode()); result = prime * result + ((getDeliveryAddressId() == null) ? 0 : getDeliveryAddressId().hashCode()); + result = prime * result + ((getDeliveryAddress() == null) ? 0 : getDeliveryAddress().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode()); @@ -257,7 +318,11 @@ public class GoodsOrder implements Serializable { sb.append(", skuId=").append(skuId); sb.append(", orderNo=").append(orderNo); sb.append(", childOrderNo=").append(childOrderNo); + sb.append(", payPrice=").append(payPrice); + sb.append(", orderPrice=").append(orderPrice); + sb.append(", freightPrice=").append(freightPrice); sb.append(", deliveryAddressId=").append(deliveryAddressId); + sb.append(", deliveryAddress=").append(deliveryAddress); sb.append(", createTime=").append(createTime); sb.append(", updateTime=").append(updateTime); sb.append(", opId=").append(opId); 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 be8b1c61..7807618a 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsOrderExample.java @@ -1,5 +1,6 @@ package com.hai.entity; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -465,6 +466,186 @@ public class GoodsOrderExample { return (Criteria) this; } + public Criteria andPayPriceIsNull() { + addCriterion("pay_price is null"); + return (Criteria) this; + } + + public Criteria andPayPriceIsNotNull() { + addCriterion("pay_price is not null"); + return (Criteria) this; + } + + public Criteria andPayPriceEqualTo(BigDecimal value) { + addCriterion("pay_price =", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceNotEqualTo(BigDecimal value) { + addCriterion("pay_price <>", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceGreaterThan(BigDecimal value) { + addCriterion("pay_price >", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("pay_price >=", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceLessThan(BigDecimal value) { + addCriterion("pay_price <", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("pay_price <=", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceIn(List values) { + addCriterion("pay_price in", values, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceNotIn(List values) { + addCriterion("pay_price not in", values, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_price between", value1, value2, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_price not between", value1, value2, "payPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceIsNull() { + addCriterion("order_price is null"); + return (Criteria) this; + } + + public Criteria andOrderPriceIsNotNull() { + addCriterion("order_price is not null"); + return (Criteria) this; + } + + public Criteria andOrderPriceEqualTo(BigDecimal value) { + addCriterion("order_price =", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceNotEqualTo(BigDecimal value) { + addCriterion("order_price <>", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceGreaterThan(BigDecimal value) { + addCriterion("order_price >", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("order_price >=", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceLessThan(BigDecimal value) { + addCriterion("order_price <", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("order_price <=", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceIn(List values) { + addCriterion("order_price in", values, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceNotIn(List values) { + addCriterion("order_price not in", values, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("order_price between", value1, value2, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("order_price not between", value1, value2, "orderPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceIsNull() { + addCriterion("freight_price is null"); + return (Criteria) this; + } + + public Criteria andFreightPriceIsNotNull() { + addCriterion("freight_price is not null"); + return (Criteria) this; + } + + public Criteria andFreightPriceEqualTo(BigDecimal value) { + addCriterion("freight_price =", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceNotEqualTo(BigDecimal value) { + addCriterion("freight_price <>", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceGreaterThan(BigDecimal value) { + addCriterion("freight_price >", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("freight_price >=", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceLessThan(BigDecimal value) { + addCriterion("freight_price <", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("freight_price <=", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceIn(List values) { + addCriterion("freight_price in", values, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceNotIn(List values) { + addCriterion("freight_price not in", values, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("freight_price between", value1, value2, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("freight_price not between", value1, value2, "freightPrice"); + return (Criteria) this; + } + public Criteria andDeliveryAddressIdIsNull() { addCriterion("delivery_address_id is null"); return (Criteria) this; @@ -525,6 +706,76 @@ public class GoodsOrderExample { return (Criteria) this; } + public Criteria andDeliveryAddressIsNull() { + addCriterion("delivery_address is null"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressIsNotNull() { + addCriterion("delivery_address is not null"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressEqualTo(String value) { + addCriterion("delivery_address =", value, "deliveryAddress"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressNotEqualTo(String value) { + addCriterion("delivery_address <>", value, "deliveryAddress"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressGreaterThan(String value) { + addCriterion("delivery_address >", value, "deliveryAddress"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressGreaterThanOrEqualTo(String value) { + addCriterion("delivery_address >=", value, "deliveryAddress"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressLessThan(String value) { + addCriterion("delivery_address <", value, "deliveryAddress"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressLessThanOrEqualTo(String value) { + addCriterion("delivery_address <=", value, "deliveryAddress"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressLike(String value) { + addCriterion("delivery_address like", value, "deliveryAddress"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressNotLike(String value) { + addCriterion("delivery_address not like", value, "deliveryAddress"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressIn(List values) { + addCriterion("delivery_address in", values, "deliveryAddress"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressNotIn(List values) { + addCriterion("delivery_address not in", values, "deliveryAddress"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressBetween(String value1, String value2) { + addCriterion("delivery_address between", value1, value2, "deliveryAddress"); + return (Criteria) this; + } + + public Criteria andDeliveryAddressNotBetween(String value1, String value2) { + addCriterion("delivery_address not between", value1, value2, "deliveryAddress"); + return (Criteria) this; + } + public Criteria andCreateTimeIsNull() { addCriterion("create_time is null"); return (Criteria) this; diff --git a/private-rsa.key b/private-rsa.key deleted file mode 100644 index 44985023..00000000 --- a/private-rsa.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpgIBAAKCAQEAx3zmcfO6srqbyV+8m/ASZsCIe7oXuxyngotKnha/RiqsCJ+Z -x3ymJxERJfWq4ZxaEEUZ3ny1oqkXcAUJydF6oRt63wsSbN//S76Vqg278LchvKRz -zCjPy/8P5iRsRU63zdcYCsa1wdbVyIrr3rqyK6F0iNFg+1iOF/yT4z2yHsR3iXhY -CvahvvBH4bFlUGeB2LoD8QPSPwXV0g0grCPxtt1crhVq/ub2hujYluWcC/SmHjaa -7evbAv3iP66Z7RjxuiOMKw74PrwREEZCh7NPkxcVa6uYH257eWAnzYtueL+lZt+u -VOYm8X2gMuBauOnLc2ZReQWoC9NPMgAk0ROJowIDAQABAoIBAQCUtag4dF/OEsxF -fufkO0AMdySHT3+XTdIVv+6dEQn/rZnXR9rkWiimYNOuv4dmbh65mDmjoMXqfzDo -oejdGRrYdNrQ4LkYjpcLCQUa4ugilvJAZTupixb01KwufSJ1PCxK9ziF+AHQgW2W -9PDGddiSK+bqg2NPm4E5omFAemKJCcyxqv5CUiOuSvSgRdF8rhmqCXiB7aNKBb0E -dkP+mBp1J7QKSrTOzUBqVOB2gPR8o/2e1uJc3tr/MfRniWyYJhjmRW/xKzl0aAq4 -eauLHvyLcnHF/nO1Mpp+mW/mvrGlBqUnZywi564rujKnVC9bjzHdidbwSqSMru8W -OT2EmuJJAoGBAPSiZmCG3vaFbCbNSPNY7tBfryo72HQxdh7sw3YbkMFqDQ0yzbBv -Q05clMEoXm6ZbELoiQBxfYAD1ieYwsxrQdZIAPyhBEz95kXBbII21jPxneUN/efD -MAdipr3/2sUnSMQXKO04DelSqI+gsm0hTm/aLrni0c9b1py4LNaWnpL3AoGBANDB -iwArunMGAO49dgX1EC9aPwheJeVMjnTlmG52dVNet8qgcY3LC3h2bWrhxjmnSVqw -ue/2T+7HsKmr/+MRF8drqsX1ad8FZ95uaLbFCsgPn5d57RV9JO5aP0mOOwmD+faB -xRU5hNctJ2S/sIq4VpX740iJFBp2of/RQMaTfie1AoGBAPPxnbVTyLJ7icWHn99K -J5qST9IFq2ryh59+6cq04jx8zFcE+ieeS7ewioWzA7e2NkbiKvvOMB+fs8X4hwfh -TN2pH5LL3cYIyb91igavOBrELXdj5HVgJly2+x8sK7O94Mnpbl5fL0AjtQLEdChu -thDDuSSUEjR8mB3fapbxy18xAoGBALsHa92vT9CV5GeOMRuNP/7sv+RjVVhmios4 -2KS/BMa46blkndgHvjMjB0znEo28zv+trijLaTnpNuIM86kgO0mzsMDC6yOg2Dp0 -eOSnDM3JEZbI6hyCjn/t4x2njEUuNNkh0sz9R4LxNYYSJ71hAlJF5o+qIJTFDMcB -VyOSKUixAoGBAKYoGXCPLkIfNNlNB4KnS2XMI4tQ1tFUVUWvtQNZkEZDg4+gZUpS -dGC89qnU2xyoPYZfQh7x+zXNlFUxnB93kT3P4WU80CNqWBo04o0M10kcCifdbhIk -yddlz7T2c1hKPxuTgMWQwMwiBmzdjjkKLroXYVNXZRfHNuXQ/2UccHvp ------END RSA PRIVATE KEY----- diff --git a/rsa.pem b/rsa.pem deleted file mode 100644 index e69de29b..00000000