From 8280e5f69bcb27c612d6982f5a354422e623f1aa Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 18 Apr 2023 19:01:53 +0800 Subject: [PATCH] Changes --- .../java/com/hai/dao/GoodsOrderMapper.java | 25 +- .../com/hai/dao/GoodsOrderSqlProvider.java | 56 --- .../com/hai/dao/HighChildOrderMapper.java | 85 ++-- .../hai/dao/HighChildOrderSqlProvider.java | 126 ++--- .../main/java/com/hai/entity/GoodsOrder.java | 64 --- .../com/hai/entity/GoodsOrderExample.java | 260 ---------- .../java/com/hai/entity/HighChildOrder.java | 252 +++++----- .../com/hai/entity/HighChildOrderExample.java | 454 ++++++++++-------- 8 files changed, 509 insertions(+), 813 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 aaca3311..8d303d6f 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsOrderMapper.java @@ -39,17 +39,13 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into goods_order (logistics_no, sku_id, ", - "order_no, child_order_no, ", - "pay_price, order_price, ", + "insert into goods_order (logistics_no, order_no, ", "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}, ", - "#{payPrice,jdbcType=DECIMAL}, #{orderPrice,jdbcType=DECIMAL}, ", + "values (#{logisticsNo,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, ", "#{freightPrice,jdbcType=DECIMAL}, #{deliveryAddressId,jdbcType=BIGINT}, ", "#{deliveryAddress,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ", @@ -67,11 +63,7 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { @Results({ @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_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), @@ -88,20 +80,15 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { @Select({ "select", - "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", + "id, logistics_no, order_no, 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}" }) @Results({ @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_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), @@ -128,11 +115,7 @@ public interface GoodsOrderMapper extends GoodsOrderMapperExt { @Update({ "update goods_order", "set logistics_no = #{logisticsNo,jdbcType=VARCHAR},", - "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},", 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 45660df1..900d67f8 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsOrderSqlProvider.java @@ -32,26 +32,10 @@ public class GoodsOrderSqlProvider { sql.VALUES("logistics_no", "#{logisticsNo,jdbcType=VARCHAR}"); } - if (record.getSkuId() != null) { - sql.VALUES("sku_id", "#{skuId,jdbcType=VARCHAR}"); - } - if (record.getOrderNo() != null) { sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); } - if (record.getChildOrderNo() != null) { - 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}"); } @@ -107,11 +91,7 @@ public class GoodsOrderSqlProvider { sql.SELECT("id"); } sql.SELECT("logistics_no"); - 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"); @@ -148,26 +128,10 @@ public class GoodsOrderSqlProvider { sql.SET("logistics_no = #{record.logisticsNo,jdbcType=VARCHAR}"); } - if (record.getSkuId() != null) { - sql.SET("sku_id = #{record.skuId,jdbcType=VARCHAR}"); - } - if (record.getOrderNo() != null) { sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); } - if (record.getChildOrderNo() != null) { - 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}"); } @@ -222,11 +186,7 @@ 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_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}"); @@ -252,26 +212,10 @@ public class GoodsOrderSqlProvider { sql.SET("logistics_no = #{logisticsNo,jdbcType=VARCHAR}"); } - if (record.getSkuId() != null) { - sql.SET("sku_id = #{skuId,jdbcType=VARCHAR}"); - } - if (record.getOrderNo() != null) { sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); } - if (record.getChildOrderNo() != null) { - 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}"); } 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 741667e4..dbdadaee 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java @@ -45,38 +45,38 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "store_name, store_address, ", "goods_type, goods_id, ", "goods_name, goods_desc, ", - "goods_img, goods_spec_name, ", - "goods_price, goods_actual_price, ", - "total_price, total_actual_price, ", - "total_deduction_price, sale_count, ", - "surplus_refund_num, surplus_refund_price, ", - "surplus_refund_integral, channel_order_no, ", - "giveaway_type, child_order_status, ", - "praise_status, create_time, ", - "pay_time, finish_time, ", - "refund_time, refund_remarks, ", - "cancel_time, ext_1, ", - "ext_2, ext_3, ext_4, ", - "ext_5, ext_6)", + "goods_img, sku_id, ", + "goods_spec_name, goods_price, ", + "goods_actual_price, surplus_refund_num, ", + "surplus_refund_price, surplus_refund_integral, ", + "channel_order_no, total_price, ", + "total_actual_price, total_deduction_price, ", + "sale_count, giveaway_type, ", + "child_order_status, praise_status, ", + "create_time, pay_time, ", + "finish_time, refund_time, ", + "refund_remarks, cancel_time, ", + "ext_1, ext_2, ext_3, ", + "ext_4, ext_5, ext_6)", "values (#{orderId,jdbcType=BIGINT}, #{orderNo,jdbcType=VARCHAR}, ", "#{memId,jdbcType=BIGINT}, #{memName,jdbcType=VARCHAR}, #{memPhone,jdbcType=VARCHAR}, ", "#{childOrderNo,jdbcType=VARCHAR}, #{storeId,jdbcType=BIGINT}, ", "#{storeName,jdbcType=VARCHAR}, #{storeAddress,jdbcType=VARCHAR}, ", "#{goodsType,jdbcType=INTEGER}, #{goodsId,jdbcType=BIGINT}, ", "#{goodsName,jdbcType=VARCHAR}, #{goodsDesc,jdbcType=VARCHAR}, ", - "#{goodsImg,jdbcType=VARCHAR}, #{goodsSpecName,jdbcType=VARCHAR}, ", - "#{goodsPrice,jdbcType=DECIMAL}, #{goodsActualPrice,jdbcType=DECIMAL}, ", - "#{totalPrice,jdbcType=DECIMAL}, #{totalActualPrice,jdbcType=DECIMAL}, ", - "#{totalDeductionPrice,jdbcType=DECIMAL}, #{saleCount,jdbcType=INTEGER}, ", - "#{surplusRefundNum,jdbcType=INTEGER}, #{surplusRefundPrice,jdbcType=DECIMAL}, ", - "#{surplusRefundIntegral,jdbcType=INTEGER}, #{channelOrderNo,jdbcType=VARCHAR}, ", - "#{giveawayType,jdbcType=BIT}, #{childOrderStatus,jdbcType=INTEGER}, ", - "#{praiseStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{payTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ", - "#{refundTime,jdbcType=TIMESTAMP}, #{refundRemarks,jdbcType=VARCHAR}, ", - "#{cancelTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, #{ext4,jdbcType=VARCHAR}, ", - "#{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})" + "#{goodsImg,jdbcType=VARCHAR}, #{skuId,jdbcType=BIGINT}, ", + "#{goodsSpecName,jdbcType=VARCHAR}, #{goodsPrice,jdbcType=DECIMAL}, ", + "#{goodsActualPrice,jdbcType=DECIMAL}, #{surplusRefundNum,jdbcType=INTEGER}, ", + "#{surplusRefundPrice,jdbcType=DECIMAL}, #{surplusRefundIntegral,jdbcType=INTEGER}, ", + "#{channelOrderNo,jdbcType=VARCHAR}, #{totalPrice,jdbcType=DECIMAL}, ", + "#{totalActualPrice,jdbcType=DECIMAL}, #{totalDeductionPrice,jdbcType=DECIMAL}, ", + "#{saleCount,jdbcType=INTEGER}, #{giveawayType,jdbcType=BIT}, ", + "#{childOrderStatus,jdbcType=INTEGER}, #{praiseStatus,jdbcType=INTEGER}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ", + "#{finishTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, ", + "#{refundRemarks,jdbcType=VARCHAR}, #{cancelTime,jdbcType=TIMESTAMP}, ", + "#{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,17 +102,18 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_desc", property="goodsDesc", jdbcType=JdbcType.VARCHAR), @Result(column="goods_img", property="goodsImg", jdbcType=JdbcType.VARCHAR), + @Result(column="sku_id", property="skuId", jdbcType=JdbcType.BIGINT), @Result(column="goods_spec_name", property="goodsSpecName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_price", property="goodsPrice", jdbcType=JdbcType.DECIMAL), @Result(column="goods_actual_price", property="goodsActualPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="total_actual_price", property="totalActualPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="sale_count", property="saleCount", jdbcType=JdbcType.INTEGER), @Result(column="surplus_refund_num", property="surplusRefundNum", jdbcType=JdbcType.INTEGER), @Result(column="surplus_refund_price", property="surplusRefundPrice", jdbcType=JdbcType.DECIMAL), @Result(column="surplus_refund_integral", property="surplusRefundIntegral", jdbcType=JdbcType.INTEGER), @Result(column="channel_order_no", property="channelOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="total_actual_price", property="totalActualPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="sale_count", property="saleCount", jdbcType=JdbcType.INTEGER), @Result(column="giveaway_type", property="giveawayType", jdbcType=JdbcType.BIT), @Result(column="child_order_status", property="childOrderStatus", jdbcType=JdbcType.INTEGER), @Result(column="praise_status", property="praiseStatus", jdbcType=JdbcType.INTEGER), @@ -135,9 +136,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "select", "id, order_id, order_no, mem_id, mem_name, mem_phone, child_order_no, store_id, ", "store_name, store_address, goods_type, goods_id, goods_name, goods_desc, goods_img, ", - "goods_spec_name, goods_price, goods_actual_price, total_price, total_actual_price, ", - "total_deduction_price, sale_count, surplus_refund_num, surplus_refund_price, ", - "surplus_refund_integral, channel_order_no, giveaway_type, child_order_status, ", + "sku_id, goods_spec_name, goods_price, goods_actual_price, surplus_refund_num, ", + "surplus_refund_price, surplus_refund_integral, channel_order_no, total_price, ", + "total_actual_price, total_deduction_price, sale_count, giveaway_type, child_order_status, ", "praise_status, create_time, pay_time, finish_time, refund_time, refund_remarks, ", "cancel_time, ext_1, ext_2, ext_3, ext_4, ext_5, ext_6", "from high_child_order", @@ -159,17 +160,18 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_desc", property="goodsDesc", jdbcType=JdbcType.VARCHAR), @Result(column="goods_img", property="goodsImg", jdbcType=JdbcType.VARCHAR), + @Result(column="sku_id", property="skuId", jdbcType=JdbcType.BIGINT), @Result(column="goods_spec_name", property="goodsSpecName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_price", property="goodsPrice", jdbcType=JdbcType.DECIMAL), @Result(column="goods_actual_price", property="goodsActualPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="total_actual_price", property="totalActualPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="sale_count", property="saleCount", jdbcType=JdbcType.INTEGER), @Result(column="surplus_refund_num", property="surplusRefundNum", jdbcType=JdbcType.INTEGER), @Result(column="surplus_refund_price", property="surplusRefundPrice", jdbcType=JdbcType.DECIMAL), @Result(column="surplus_refund_integral", property="surplusRefundIntegral", jdbcType=JdbcType.INTEGER), @Result(column="channel_order_no", property="channelOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="total_actual_price", property="totalActualPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="sale_count", property="saleCount", jdbcType=JdbcType.INTEGER), @Result(column="giveaway_type", property="giveawayType", jdbcType=JdbcType.BIT), @Result(column="child_order_status", property="childOrderStatus", jdbcType=JdbcType.INTEGER), @Result(column="praise_status", property="praiseStatus", jdbcType=JdbcType.INTEGER), @@ -213,17 +215,18 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "goods_name = #{goodsName,jdbcType=VARCHAR},", "goods_desc = #{goodsDesc,jdbcType=VARCHAR},", "goods_img = #{goodsImg,jdbcType=VARCHAR},", + "sku_id = #{skuId,jdbcType=BIGINT},", "goods_spec_name = #{goodsSpecName,jdbcType=VARCHAR},", "goods_price = #{goodsPrice,jdbcType=DECIMAL},", "goods_actual_price = #{goodsActualPrice,jdbcType=DECIMAL},", - "total_price = #{totalPrice,jdbcType=DECIMAL},", - "total_actual_price = #{totalActualPrice,jdbcType=DECIMAL},", - "total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL},", - "sale_count = #{saleCount,jdbcType=INTEGER},", "surplus_refund_num = #{surplusRefundNum,jdbcType=INTEGER},", "surplus_refund_price = #{surplusRefundPrice,jdbcType=DECIMAL},", "surplus_refund_integral = #{surplusRefundIntegral,jdbcType=INTEGER},", "channel_order_no = #{channelOrderNo,jdbcType=VARCHAR},", + "total_price = #{totalPrice,jdbcType=DECIMAL},", + "total_actual_price = #{totalActualPrice,jdbcType=DECIMAL},", + "total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL},", + "sale_count = #{saleCount,jdbcType=INTEGER},", "giveaway_type = #{giveawayType,jdbcType=BIT},", "child_order_status = #{childOrderStatus,jdbcType=INTEGER},", "praise_status = #{praiseStatus,jdbcType=INTEGER},", 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 8fd46ba2..0fdbb1b7 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java @@ -84,6 +84,10 @@ public class HighChildOrderSqlProvider { sql.VALUES("goods_img", "#{goodsImg,jdbcType=VARCHAR}"); } + if (record.getSkuId() != null) { + sql.VALUES("sku_id", "#{skuId,jdbcType=BIGINT}"); + } + if (record.getGoodsSpecName() != null) { sql.VALUES("goods_spec_name", "#{goodsSpecName,jdbcType=VARCHAR}"); } @@ -96,22 +100,6 @@ public class HighChildOrderSqlProvider { sql.VALUES("goods_actual_price", "#{goodsActualPrice,jdbcType=DECIMAL}"); } - if (record.getTotalPrice() != null) { - sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}"); - } - - if (record.getTotalActualPrice() != null) { - sql.VALUES("total_actual_price", "#{totalActualPrice,jdbcType=DECIMAL}"); - } - - if (record.getTotalDeductionPrice() != null) { - sql.VALUES("total_deduction_price", "#{totalDeductionPrice,jdbcType=DECIMAL}"); - } - - if (record.getSaleCount() != null) { - sql.VALUES("sale_count", "#{saleCount,jdbcType=INTEGER}"); - } - if (record.getSurplusRefundNum() != null) { sql.VALUES("surplus_refund_num", "#{surplusRefundNum,jdbcType=INTEGER}"); } @@ -128,6 +116,22 @@ public class HighChildOrderSqlProvider { sql.VALUES("channel_order_no", "#{channelOrderNo,jdbcType=VARCHAR}"); } + if (record.getTotalPrice() != null) { + sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}"); + } + + if (record.getTotalActualPrice() != null) { + sql.VALUES("total_actual_price", "#{totalActualPrice,jdbcType=DECIMAL}"); + } + + if (record.getTotalDeductionPrice() != null) { + sql.VALUES("total_deduction_price", "#{totalDeductionPrice,jdbcType=DECIMAL}"); + } + + if (record.getSaleCount() != null) { + sql.VALUES("sale_count", "#{saleCount,jdbcType=INTEGER}"); + } + if (record.getGiveawayType() != null) { sql.VALUES("giveaway_type", "#{giveawayType,jdbcType=BIT}"); } @@ -212,17 +216,18 @@ public class HighChildOrderSqlProvider { sql.SELECT("goods_name"); sql.SELECT("goods_desc"); sql.SELECT("goods_img"); + sql.SELECT("sku_id"); sql.SELECT("goods_spec_name"); sql.SELECT("goods_price"); sql.SELECT("goods_actual_price"); - sql.SELECT("total_price"); - sql.SELECT("total_actual_price"); - sql.SELECT("total_deduction_price"); - sql.SELECT("sale_count"); sql.SELECT("surplus_refund_num"); sql.SELECT("surplus_refund_price"); sql.SELECT("surplus_refund_integral"); sql.SELECT("channel_order_no"); + sql.SELECT("total_price"); + sql.SELECT("total_actual_price"); + sql.SELECT("total_deduction_price"); + sql.SELECT("sale_count"); sql.SELECT("giveaway_type"); sql.SELECT("child_order_status"); sql.SELECT("praise_status"); @@ -315,6 +320,10 @@ public class HighChildOrderSqlProvider { sql.SET("goods_img = #{record.goodsImg,jdbcType=VARCHAR}"); } + if (record.getSkuId() != null) { + sql.SET("sku_id = #{record.skuId,jdbcType=BIGINT}"); + } + if (record.getGoodsSpecName() != null) { sql.SET("goods_spec_name = #{record.goodsSpecName,jdbcType=VARCHAR}"); } @@ -327,22 +336,6 @@ public class HighChildOrderSqlProvider { sql.SET("goods_actual_price = #{record.goodsActualPrice,jdbcType=DECIMAL}"); } - if (record.getTotalPrice() != null) { - sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); - } - - if (record.getTotalActualPrice() != null) { - sql.SET("total_actual_price = #{record.totalActualPrice,jdbcType=DECIMAL}"); - } - - if (record.getTotalDeductionPrice() != null) { - sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}"); - } - - if (record.getSaleCount() != null) { - sql.SET("sale_count = #{record.saleCount,jdbcType=INTEGER}"); - } - if (record.getSurplusRefundNum() != null) { sql.SET("surplus_refund_num = #{record.surplusRefundNum,jdbcType=INTEGER}"); } @@ -359,6 +352,22 @@ public class HighChildOrderSqlProvider { sql.SET("channel_order_no = #{record.channelOrderNo,jdbcType=VARCHAR}"); } + if (record.getTotalPrice() != null) { + sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); + } + + if (record.getTotalActualPrice() != null) { + sql.SET("total_actual_price = #{record.totalActualPrice,jdbcType=DECIMAL}"); + } + + if (record.getTotalDeductionPrice() != null) { + sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}"); + } + + if (record.getSaleCount() != null) { + sql.SET("sale_count = #{record.saleCount,jdbcType=INTEGER}"); + } + if (record.getGiveawayType() != null) { sql.SET("giveaway_type = #{record.giveawayType,jdbcType=BIT}"); } @@ -442,17 +451,18 @@ public class HighChildOrderSqlProvider { sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}"); sql.SET("goods_desc = #{record.goodsDesc,jdbcType=VARCHAR}"); sql.SET("goods_img = #{record.goodsImg,jdbcType=VARCHAR}"); + sql.SET("sku_id = #{record.skuId,jdbcType=BIGINT}"); sql.SET("goods_spec_name = #{record.goodsSpecName,jdbcType=VARCHAR}"); sql.SET("goods_price = #{record.goodsPrice,jdbcType=DECIMAL}"); sql.SET("goods_actual_price = #{record.goodsActualPrice,jdbcType=DECIMAL}"); - sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); - sql.SET("total_actual_price = #{record.totalActualPrice,jdbcType=DECIMAL}"); - sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}"); - sql.SET("sale_count = #{record.saleCount,jdbcType=INTEGER}"); sql.SET("surplus_refund_num = #{record.surplusRefundNum,jdbcType=INTEGER}"); sql.SET("surplus_refund_price = #{record.surplusRefundPrice,jdbcType=DECIMAL}"); sql.SET("surplus_refund_integral = #{record.surplusRefundIntegral,jdbcType=INTEGER}"); sql.SET("channel_order_no = #{record.channelOrderNo,jdbcType=VARCHAR}"); + sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); + sql.SET("total_actual_price = #{record.totalActualPrice,jdbcType=DECIMAL}"); + sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}"); + sql.SET("sale_count = #{record.saleCount,jdbcType=INTEGER}"); sql.SET("giveaway_type = #{record.giveawayType,jdbcType=BIT}"); sql.SET("child_order_status = #{record.childOrderStatus,jdbcType=INTEGER}"); sql.SET("praise_status = #{record.praiseStatus,jdbcType=INTEGER}"); @@ -534,6 +544,10 @@ public class HighChildOrderSqlProvider { sql.SET("goods_img = #{goodsImg,jdbcType=VARCHAR}"); } + if (record.getSkuId() != null) { + sql.SET("sku_id = #{skuId,jdbcType=BIGINT}"); + } + if (record.getGoodsSpecName() != null) { sql.SET("goods_spec_name = #{goodsSpecName,jdbcType=VARCHAR}"); } @@ -546,22 +560,6 @@ public class HighChildOrderSqlProvider { sql.SET("goods_actual_price = #{goodsActualPrice,jdbcType=DECIMAL}"); } - if (record.getTotalPrice() != null) { - sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}"); - } - - if (record.getTotalActualPrice() != null) { - sql.SET("total_actual_price = #{totalActualPrice,jdbcType=DECIMAL}"); - } - - if (record.getTotalDeductionPrice() != null) { - sql.SET("total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL}"); - } - - if (record.getSaleCount() != null) { - sql.SET("sale_count = #{saleCount,jdbcType=INTEGER}"); - } - if (record.getSurplusRefundNum() != null) { sql.SET("surplus_refund_num = #{surplusRefundNum,jdbcType=INTEGER}"); } @@ -578,6 +576,22 @@ public class HighChildOrderSqlProvider { sql.SET("channel_order_no = #{channelOrderNo,jdbcType=VARCHAR}"); } + if (record.getTotalPrice() != null) { + sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}"); + } + + if (record.getTotalActualPrice() != null) { + sql.SET("total_actual_price = #{totalActualPrice,jdbcType=DECIMAL}"); + } + + if (record.getTotalDeductionPrice() != null) { + sql.SET("total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL}"); + } + + if (record.getSaleCount() != null) { + sql.SET("sale_count = #{saleCount,jdbcType=INTEGER}"); + } + if (record.getGiveawayType() != null) { sql.SET("giveaway_type = #{giveawayType,jdbcType=BIT}"); } 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 020b8212..c874bade 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsOrder.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsOrder.java @@ -24,31 +24,11 @@ public class GoodsOrder implements Serializable { */ private String logisticsNo; - /** - * 规格编码 - */ - private String skuId; - /** * 订单号 */ private String orderNo; - /** - * 子订单号 - */ - private String childOrderNo; - - /** - * 支付金额 - */ - private BigDecimal payPrice; - - /** - * 订单金额 - */ - private BigDecimal orderPrice; - /** * 运费 */ @@ -122,14 +102,6 @@ public class GoodsOrder implements Serializable { this.logisticsNo = logisticsNo; } - public String getSkuId() { - return skuId; - } - - public void setSkuId(String skuId) { - this.skuId = skuId; - } - public String getOrderNo() { return orderNo; } @@ -138,30 +110,6 @@ public class GoodsOrder implements Serializable { this.orderNo = orderNo; } - public String getChildOrderNo() { - return childOrderNo; - } - - public void setChildOrderNo(String childOrderNo) { - 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; } @@ -264,11 +212,7 @@ public class GoodsOrder implements Serializable { GoodsOrder other = (GoodsOrder) that; 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.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())) @@ -288,11 +232,7 @@ public class GoodsOrder implements Serializable { int result = 1; 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 + ((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()); @@ -315,11 +255,7 @@ public class GoodsOrder implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", logisticsNo=").append(logisticsNo); - 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); 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 7807618a..1deb5e07 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsOrderExample.java @@ -256,76 +256,6 @@ public class GoodsOrderExample { return (Criteria) this; } - public Criteria andSkuIdIsNull() { - addCriterion("sku_id is null"); - return (Criteria) this; - } - - public Criteria andSkuIdIsNotNull() { - addCriterion("sku_id is not null"); - return (Criteria) this; - } - - public Criteria andSkuIdEqualTo(String value) { - addCriterion("sku_id =", value, "skuId"); - return (Criteria) this; - } - - public Criteria andSkuIdNotEqualTo(String value) { - addCriterion("sku_id <>", value, "skuId"); - return (Criteria) this; - } - - public Criteria andSkuIdGreaterThan(String value) { - addCriterion("sku_id >", value, "skuId"); - return (Criteria) this; - } - - public Criteria andSkuIdGreaterThanOrEqualTo(String value) { - addCriterion("sku_id >=", value, "skuId"); - return (Criteria) this; - } - - public Criteria andSkuIdLessThan(String value) { - addCriterion("sku_id <", value, "skuId"); - return (Criteria) this; - } - - public Criteria andSkuIdLessThanOrEqualTo(String value) { - addCriterion("sku_id <=", value, "skuId"); - return (Criteria) this; - } - - public Criteria andSkuIdLike(String value) { - addCriterion("sku_id like", value, "skuId"); - return (Criteria) this; - } - - public Criteria andSkuIdNotLike(String value) { - addCriterion("sku_id not like", value, "skuId"); - return (Criteria) this; - } - - public Criteria andSkuIdIn(List values) { - addCriterion("sku_id in", values, "skuId"); - return (Criteria) this; - } - - public Criteria andSkuIdNotIn(List values) { - addCriterion("sku_id not in", values, "skuId"); - return (Criteria) this; - } - - public Criteria andSkuIdBetween(String value1, String value2) { - addCriterion("sku_id between", value1, value2, "skuId"); - return (Criteria) this; - } - - public Criteria andSkuIdNotBetween(String value1, String value2) { - addCriterion("sku_id not between", value1, value2, "skuId"); - return (Criteria) this; - } - public Criteria andOrderNoIsNull() { addCriterion("order_no is null"); return (Criteria) this; @@ -396,196 +326,6 @@ public class GoodsOrderExample { return (Criteria) this; } - public Criteria andChildOrderNoIsNull() { - addCriterion("child_order_no is null"); - return (Criteria) this; - } - - public Criteria andChildOrderNoIsNotNull() { - addCriterion("child_order_no is not null"); - return (Criteria) this; - } - - public Criteria andChildOrderNoEqualTo(String value) { - addCriterion("child_order_no =", value, "childOrderNo"); - return (Criteria) this; - } - - public Criteria andChildOrderNoNotEqualTo(String value) { - addCriterion("child_order_no <>", value, "childOrderNo"); - return (Criteria) this; - } - - public Criteria andChildOrderNoGreaterThan(String value) { - addCriterion("child_order_no >", value, "childOrderNo"); - return (Criteria) this; - } - - public Criteria andChildOrderNoGreaterThanOrEqualTo(String value) { - addCriterion("child_order_no >=", value, "childOrderNo"); - return (Criteria) this; - } - - public Criteria andChildOrderNoLessThan(String value) { - addCriterion("child_order_no <", value, "childOrderNo"); - return (Criteria) this; - } - - public Criteria andChildOrderNoLessThanOrEqualTo(String value) { - addCriterion("child_order_no <=", value, "childOrderNo"); - return (Criteria) this; - } - - public Criteria andChildOrderNoLike(String value) { - addCriterion("child_order_no like", value, "childOrderNo"); - return (Criteria) this; - } - - 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; - } - - 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; 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 2ec9e8f1..ae758414 100644 --- a/hai-service/src/main/java/com/hai/entity/HighChildOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighChildOrder.java @@ -6,12 +6,12 @@ import java.util.Date; /** * high_child_order - * @author + * @author */ /** - * + * * 代码由工具生成 - * + * **/ public class HighChildOrder implements Serializable { /** @@ -65,17 +65,17 @@ public class HighChildOrder implements Serializable { private String storeAddress; /** - * 商品类型 - 1. 卡卷 - 2. 积分充值 - 3. 加油订单 - 4. KFC - 5. 电影票 - 6. 话费充值 - 7. 优惠卷包 - 8. 汇联通充值 - 9. 星巴克 - 10. 第三方充值 + * 商品类型 +1. 卡卷 +2. 积分充值 +3. 加油订单 +4. KFC +5. 电影票 +6. 话费充值 +7. 优惠卷包 +8. 汇联通充值 +9. 星巴克 +10. 第三方充值 */ private Integer goodsType; @@ -99,6 +99,11 @@ public class HighChildOrder implements Serializable { */ private String goodsImg; + /** + * 属性编码 + */ + private Long skuId; + /** * 商品规格名称 */ @@ -115,44 +120,44 @@ public class HighChildOrder implements Serializable { private BigDecimal goodsActualPrice; /** - * 商品的价格（单价*数量） + * 剩余退款数量 */ - private BigDecimal totalPrice; + private Integer surplusRefundNum; /** - * 商品实际总价（实际单价*数量） + * 剩余退款金额 */ - private BigDecimal totalActualPrice; + private BigDecimal surplusRefundPrice; /** - * 商品总优惠金额 + * 剩余退款积分 */ - private BigDecimal totalDeductionPrice; + private Integer surplusRefundIntegral; /** - * 商品的数量 + * 渠道订单号 */ - private Integer saleCount; + private String channelOrderNo; /** - * 剩余退款数量 + * 商品的价格（单价*数量） */ - private Integer surplusRefundNum; + private BigDecimal totalPrice; /** - * 剩余退款金额 + * 商品实际总价（实际单价*数量） */ - private BigDecimal surplusRefundPrice; + private BigDecimal totalActualPrice; /** - * 剩余退款积分 + * 商品总优惠金额 */ - private Integer surplusRefundIntegral; + private BigDecimal totalDeductionPrice; /** - * 渠道订单号 + * 商品的数量 */ - private String channelOrderNo; + private Integer saleCount; /** * 是否是赠品 0：否 1：是 @@ -161,13 +166,13 @@ public class HighChildOrder implements Serializable { /** * 子订单状态： - 1. 待支付 - 2. 已支付 - 3. 已完成 - 4. 已退款 - 5. 已取消 - 6. 退款中 - 7. 退款失败 +1. 待支付 +2. 已支付 +3. 已完成 +4. 已退款 +5. 已取消 +6. 退款中 +7. 退款失败 */ private Integer childOrderStatus; @@ -340,6 +345,14 @@ public class HighChildOrder implements Serializable { this.goodsImg = goodsImg; } + public Long getSkuId() { + return skuId; + } + + public void setSkuId(Long skuId) { + this.skuId = skuId; + } + public String getGoodsSpecName() { return goodsSpecName; } @@ -364,38 +377,6 @@ public class HighChildOrder implements Serializable { this.goodsActualPrice = goodsActualPrice; } - public BigDecimal getTotalPrice() { - return totalPrice; - } - - public void setTotalPrice(BigDecimal totalPrice) { - this.totalPrice = totalPrice; - } - - public BigDecimal getTotalActualPrice() { - return totalActualPrice; - } - - public void setTotalActualPrice(BigDecimal totalActualPrice) { - this.totalActualPrice = totalActualPrice; - } - - public BigDecimal getTotalDeductionPrice() { - return totalDeductionPrice; - } - - public void setTotalDeductionPrice(BigDecimal totalDeductionPrice) { - this.totalDeductionPrice = totalDeductionPrice; - } - - public Integer getSaleCount() { - return saleCount; - } - - public void setSaleCount(Integer saleCount) { - this.saleCount = saleCount; - } - public Integer getSurplusRefundNum() { return surplusRefundNum; } @@ -428,6 +409,38 @@ public class HighChildOrder implements Serializable { this.channelOrderNo = channelOrderNo; } + public BigDecimal getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice; + } + + public BigDecimal getTotalActualPrice() { + return totalActualPrice; + } + + public void setTotalActualPrice(BigDecimal totalActualPrice) { + this.totalActualPrice = totalActualPrice; + } + + public BigDecimal getTotalDeductionPrice() { + return totalDeductionPrice; + } + + public void setTotalDeductionPrice(BigDecimal totalDeductionPrice) { + this.totalDeductionPrice = totalDeductionPrice; + } + + public Integer getSaleCount() { + return saleCount; + } + + public void setSaleCount(Integer saleCount) { + this.saleCount = saleCount; + } + public Boolean getGiveawayType() { return giveawayType; } @@ -561,46 +574,47 @@ public class HighChildOrder implements Serializable { } HighChildOrder other = (HighChildOrder) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId())) - && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) - && (this.getMemId() == null ? other.getMemId() == null : this.getMemId().equals(other.getMemId())) - && (this.getMemName() == null ? other.getMemName() == null : this.getMemName().equals(other.getMemName())) - && (this.getMemPhone() == null ? other.getMemPhone() == null : this.getMemPhone().equals(other.getMemPhone())) - && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) - && (this.getStoreId() == null ? other.getStoreId() == null : this.getStoreId().equals(other.getStoreId())) - && (this.getStoreName() == null ? other.getStoreName() == null : this.getStoreName().equals(other.getStoreName())) - && (this.getStoreAddress() == null ? other.getStoreAddress() == null : this.getStoreAddress().equals(other.getStoreAddress())) - && (this.getGoodsType() == null ? other.getGoodsType() == null : this.getGoodsType().equals(other.getGoodsType())) - && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) - && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName())) - && (this.getGoodsDesc() == null ? other.getGoodsDesc() == null : this.getGoodsDesc().equals(other.getGoodsDesc())) - && (this.getGoodsImg() == null ? other.getGoodsImg() == null : this.getGoodsImg().equals(other.getGoodsImg())) - && (this.getGoodsSpecName() == null ? other.getGoodsSpecName() == null : this.getGoodsSpecName().equals(other.getGoodsSpecName())) - && (this.getGoodsPrice() == null ? other.getGoodsPrice() == null : this.getGoodsPrice().equals(other.getGoodsPrice())) - && (this.getGoodsActualPrice() == null ? other.getGoodsActualPrice() == null : this.getGoodsActualPrice().equals(other.getGoodsActualPrice())) - && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice())) - && (this.getTotalActualPrice() == null ? other.getTotalActualPrice() == null : this.getTotalActualPrice().equals(other.getTotalActualPrice())) - && (this.getTotalDeductionPrice() == null ? other.getTotalDeductionPrice() == null : this.getTotalDeductionPrice().equals(other.getTotalDeductionPrice())) - && (this.getSaleCount() == null ? other.getSaleCount() == null : this.getSaleCount().equals(other.getSaleCount())) - && (this.getSurplusRefundNum() == null ? other.getSurplusRefundNum() == null : this.getSurplusRefundNum().equals(other.getSurplusRefundNum())) - && (this.getSurplusRefundPrice() == null ? other.getSurplusRefundPrice() == null : this.getSurplusRefundPrice().equals(other.getSurplusRefundPrice())) - && (this.getSurplusRefundIntegral() == null ? other.getSurplusRefundIntegral() == null : this.getSurplusRefundIntegral().equals(other.getSurplusRefundIntegral())) - && (this.getChannelOrderNo() == null ? other.getChannelOrderNo() == null : this.getChannelOrderNo().equals(other.getChannelOrderNo())) - && (this.getGiveawayType() == null ? other.getGiveawayType() == null : this.getGiveawayType().equals(other.getGiveawayType())) - && (this.getChildOrderStatus() == null ? other.getChildOrderStatus() == null : this.getChildOrderStatus().equals(other.getChildOrderStatus())) - && (this.getPraiseStatus() == null ? other.getPraiseStatus() == null : this.getPraiseStatus().equals(other.getPraiseStatus())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) - && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime())) - && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) - && (this.getRefundRemarks() == null ? other.getRefundRemarks() == null : this.getRefundRemarks().equals(other.getRefundRemarks())) - && (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime())) - && (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())) - && (this.getExt4() == null ? other.getExt4() == null : this.getExt4().equals(other.getExt4())) - && (this.getExt5() == null ? other.getExt5() == null : this.getExt5().equals(other.getExt5())) - && (this.getExt6() == null ? other.getExt6() == null : this.getExt6().equals(other.getExt6())); + && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId())) + && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) + && (this.getMemId() == null ? other.getMemId() == null : this.getMemId().equals(other.getMemId())) + && (this.getMemName() == null ? other.getMemName() == null : this.getMemName().equals(other.getMemName())) + && (this.getMemPhone() == null ? other.getMemPhone() == null : this.getMemPhone().equals(other.getMemPhone())) + && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) + && (this.getStoreId() == null ? other.getStoreId() == null : this.getStoreId().equals(other.getStoreId())) + && (this.getStoreName() == null ? other.getStoreName() == null : this.getStoreName().equals(other.getStoreName())) + && (this.getStoreAddress() == null ? other.getStoreAddress() == null : this.getStoreAddress().equals(other.getStoreAddress())) + && (this.getGoodsType() == null ? other.getGoodsType() == null : this.getGoodsType().equals(other.getGoodsType())) + && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) + && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName())) + && (this.getGoodsDesc() == null ? other.getGoodsDesc() == null : this.getGoodsDesc().equals(other.getGoodsDesc())) + && (this.getGoodsImg() == null ? other.getGoodsImg() == null : this.getGoodsImg().equals(other.getGoodsImg())) + && (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId())) + && (this.getGoodsSpecName() == null ? other.getGoodsSpecName() == null : this.getGoodsSpecName().equals(other.getGoodsSpecName())) + && (this.getGoodsPrice() == null ? other.getGoodsPrice() == null : this.getGoodsPrice().equals(other.getGoodsPrice())) + && (this.getGoodsActualPrice() == null ? other.getGoodsActualPrice() == null : this.getGoodsActualPrice().equals(other.getGoodsActualPrice())) + && (this.getSurplusRefundNum() == null ? other.getSurplusRefundNum() == null : this.getSurplusRefundNum().equals(other.getSurplusRefundNum())) + && (this.getSurplusRefundPrice() == null ? other.getSurplusRefundPrice() == null : this.getSurplusRefundPrice().equals(other.getSurplusRefundPrice())) + && (this.getSurplusRefundIntegral() == null ? other.getSurplusRefundIntegral() == null : this.getSurplusRefundIntegral().equals(other.getSurplusRefundIntegral())) + && (this.getChannelOrderNo() == null ? other.getChannelOrderNo() == null : this.getChannelOrderNo().equals(other.getChannelOrderNo())) + && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice())) + && (this.getTotalActualPrice() == null ? other.getTotalActualPrice() == null : this.getTotalActualPrice().equals(other.getTotalActualPrice())) + && (this.getTotalDeductionPrice() == null ? other.getTotalDeductionPrice() == null : this.getTotalDeductionPrice().equals(other.getTotalDeductionPrice())) + && (this.getSaleCount() == null ? other.getSaleCount() == null : this.getSaleCount().equals(other.getSaleCount())) + && (this.getGiveawayType() == null ? other.getGiveawayType() == null : this.getGiveawayType().equals(other.getGiveawayType())) + && (this.getChildOrderStatus() == null ? other.getChildOrderStatus() == null : this.getChildOrderStatus().equals(other.getChildOrderStatus())) + && (this.getPraiseStatus() == null ? other.getPraiseStatus() == null : this.getPraiseStatus().equals(other.getPraiseStatus())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) + && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime())) + && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) + && (this.getRefundRemarks() == null ? other.getRefundRemarks() == null : this.getRefundRemarks().equals(other.getRefundRemarks())) + && (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime())) + && (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())) + && (this.getExt4() == null ? other.getExt4() == null : this.getExt4().equals(other.getExt4())) + && (this.getExt5() == null ? other.getExt5() == null : this.getExt5().equals(other.getExt5())) + && (this.getExt6() == null ? other.getExt6() == null : this.getExt6().equals(other.getExt6())); } @Override @@ -622,17 +636,18 @@ public class HighChildOrder implements Serializable { result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode()); result = prime * result + ((getGoodsDesc() == null) ? 0 : getGoodsDesc().hashCode()); result = prime * result + ((getGoodsImg() == null) ? 0 : getGoodsImg().hashCode()); + result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode()); result = prime * result + ((getGoodsSpecName() == null) ? 0 : getGoodsSpecName().hashCode()); result = prime * result + ((getGoodsPrice() == null) ? 0 : getGoodsPrice().hashCode()); result = prime * result + ((getGoodsActualPrice() == null) ? 0 : getGoodsActualPrice().hashCode()); - result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode()); - result = prime * result + ((getTotalActualPrice() == null) ? 0 : getTotalActualPrice().hashCode()); - result = prime * result + ((getTotalDeductionPrice() == null) ? 0 : getTotalDeductionPrice().hashCode()); - result = prime * result + ((getSaleCount() == null) ? 0 : getSaleCount().hashCode()); result = prime * result + ((getSurplusRefundNum() == null) ? 0 : getSurplusRefundNum().hashCode()); result = prime * result + ((getSurplusRefundPrice() == null) ? 0 : getSurplusRefundPrice().hashCode()); result = prime * result + ((getSurplusRefundIntegral() == null) ? 0 : getSurplusRefundIntegral().hashCode()); result = prime * result + ((getChannelOrderNo() == null) ? 0 : getChannelOrderNo().hashCode()); + result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode()); + result = prime * result + ((getTotalActualPrice() == null) ? 0 : getTotalActualPrice().hashCode()); + result = prime * result + ((getTotalDeductionPrice() == null) ? 0 : getTotalDeductionPrice().hashCode()); + result = prime * result + ((getSaleCount() == null) ? 0 : getSaleCount().hashCode()); result = prime * result + ((getGiveawayType() == null) ? 0 : getGiveawayType().hashCode()); result = prime * result + ((getChildOrderStatus() == null) ? 0 : getChildOrderStatus().hashCode()); result = prime * result + ((getPraiseStatus() == null) ? 0 : getPraiseStatus().hashCode()); @@ -672,17 +687,18 @@ public class HighChildOrder implements Serializable { sb.append(", goodsName=").append(goodsName); sb.append(", goodsDesc=").append(goodsDesc); sb.append(", goodsImg=").append(goodsImg); + sb.append(", skuId=").append(skuId); sb.append(", goodsSpecName=").append(goodsSpecName); sb.append(", goodsPrice=").append(goodsPrice); sb.append(", goodsActualPrice=").append(goodsActualPrice); - sb.append(", totalPrice=").append(totalPrice); - sb.append(", totalActualPrice=").append(totalActualPrice); - sb.append(", totalDeductionPrice=").append(totalDeductionPrice); - sb.append(", saleCount=").append(saleCount); sb.append(", surplusRefundNum=").append(surplusRefundNum); sb.append(", surplusRefundPrice=").append(surplusRefundPrice); sb.append(", surplusRefundIntegral=").append(surplusRefundIntegral); sb.append(", channelOrderNo=").append(channelOrderNo); + sb.append(", totalPrice=").append(totalPrice); + sb.append(", totalActualPrice=").append(totalActualPrice); + sb.append(", totalDeductionPrice=").append(totalDeductionPrice); + sb.append(", saleCount=").append(saleCount); sb.append(", giveawayType=").append(giveawayType); sb.append(", childOrderStatus=").append(childOrderStatus); sb.append(", praiseStatus=").append(praiseStatus); @@ -702,4 +718,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 93b8b973..fb7f808f 100644 --- a/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java @@ -1116,6 +1116,66 @@ public class HighChildOrderExample { return (Criteria) this; } + public Criteria andSkuIdIsNull() { + addCriterion("sku_id is null"); + return (Criteria) this; + } + + public Criteria andSkuIdIsNotNull() { + addCriterion("sku_id is not null"); + return (Criteria) this; + } + + public Criteria andSkuIdEqualTo(Long value) { + addCriterion("sku_id =", value, "skuId"); + return (Criteria) this; + } + + public Criteria andSkuIdNotEqualTo(Long value) { + addCriterion("sku_id <>", value, "skuId"); + return (Criteria) this; + } + + public Criteria andSkuIdGreaterThan(Long value) { + addCriterion("sku_id >", value, "skuId"); + return (Criteria) this; + } + + public Criteria andSkuIdGreaterThanOrEqualTo(Long value) { + addCriterion("sku_id >=", value, "skuId"); + return (Criteria) this; + } + + public Criteria andSkuIdLessThan(Long value) { + addCriterion("sku_id <", value, "skuId"); + return (Criteria) this; + } + + public Criteria andSkuIdLessThanOrEqualTo(Long value) { + addCriterion("sku_id <=", value, "skuId"); + return (Criteria) this; + } + + public Criteria andSkuIdIn(List values) { + addCriterion("sku_id in", values, "skuId"); + return (Criteria) this; + } + + public Criteria andSkuIdNotIn(List values) { + addCriterion("sku_id not in", values, "skuId"); + return (Criteria) this; + } + + public Criteria andSkuIdBetween(Long value1, Long value2) { + addCriterion("sku_id between", value1, value2, "skuId"); + return (Criteria) this; + } + + public Criteria andSkuIdNotBetween(Long value1, Long value2) { + addCriterion("sku_id not between", value1, value2, "skuId"); + return (Criteria) this; + } + public Criteria andGoodsSpecNameIsNull() { addCriterion("goods_spec_name is null"); return (Criteria) this; @@ -1306,493 +1366,493 @@ public class HighChildOrderExample { return (Criteria) this; } - public Criteria andTotalPriceIsNull() { - addCriterion("total_price is null"); + public Criteria andSurplusRefundNumIsNull() { + addCriterion("surplus_refund_num is null"); return (Criteria) this; } - public Criteria andTotalPriceIsNotNull() { - addCriterion("total_price is not null"); + public Criteria andSurplusRefundNumIsNotNull() { + addCriterion("surplus_refund_num is not null"); return (Criteria) this; } - public Criteria andTotalPriceEqualTo(BigDecimal value) { - addCriterion("total_price =", value, "totalPrice"); + public Criteria andSurplusRefundNumEqualTo(Integer value) { + addCriterion("surplus_refund_num =", value, "surplusRefundNum"); return (Criteria) this; } - public Criteria andTotalPriceNotEqualTo(BigDecimal value) { - addCriterion("total_price <>", value, "totalPrice"); + public Criteria andSurplusRefundNumNotEqualTo(Integer value) { + addCriterion("surplus_refund_num <>", value, "surplusRefundNum"); return (Criteria) this; } - public Criteria andTotalPriceGreaterThan(BigDecimal value) { - addCriterion("total_price >", value, "totalPrice"); + public Criteria andSurplusRefundNumGreaterThan(Integer value) { + addCriterion("surplus_refund_num >", value, "surplusRefundNum"); return (Criteria) this; } - public Criteria andTotalPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("total_price >=", value, "totalPrice"); + public Criteria andSurplusRefundNumGreaterThanOrEqualTo(Integer value) { + addCriterion("surplus_refund_num >=", value, "surplusRefundNum"); return (Criteria) this; } - public Criteria andTotalPriceLessThan(BigDecimal value) { - addCriterion("total_price <", value, "totalPrice"); + public Criteria andSurplusRefundNumLessThan(Integer value) { + addCriterion("surplus_refund_num <", value, "surplusRefundNum"); return (Criteria) this; } - public Criteria andTotalPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("total_price <=", value, "totalPrice"); + public Criteria andSurplusRefundNumLessThanOrEqualTo(Integer value) { + addCriterion("surplus_refund_num <=", value, "surplusRefundNum"); return (Criteria) this; } - public Criteria andTotalPriceIn(List values) { - addCriterion("total_price in", values, "totalPrice"); + public Criteria andSurplusRefundNumIn(List values) { + addCriterion("surplus_refund_num in", values, "surplusRefundNum"); return (Criteria) this; } - public Criteria andTotalPriceNotIn(List values) { - addCriterion("total_price not in", values, "totalPrice"); + public Criteria andSurplusRefundNumNotIn(List values) { + addCriterion("surplus_refund_num not in", values, "surplusRefundNum"); return (Criteria) this; } - public Criteria andTotalPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("total_price between", value1, value2, "totalPrice"); + public Criteria andSurplusRefundNumBetween(Integer value1, Integer value2) { + addCriterion("surplus_refund_num between", value1, value2, "surplusRefundNum"); return (Criteria) this; } - public Criteria andTotalPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("total_price not between", value1, value2, "totalPrice"); + public Criteria andSurplusRefundNumNotBetween(Integer value1, Integer value2) { + addCriterion("surplus_refund_num not between", value1, value2, "surplusRefundNum"); return (Criteria) this; } - public Criteria andTotalActualPriceIsNull() { - addCriterion("total_actual_price is null"); + public Criteria andSurplusRefundPriceIsNull() { + addCriterion("surplus_refund_price is null"); return (Criteria) this; } - public Criteria andTotalActualPriceIsNotNull() { - addCriterion("total_actual_price is not null"); + public Criteria andSurplusRefundPriceIsNotNull() { + addCriterion("surplus_refund_price is not null"); return (Criteria) this; } - public Criteria andTotalActualPriceEqualTo(BigDecimal value) { - addCriterion("total_actual_price =", value, "totalActualPrice"); + public Criteria andSurplusRefundPriceEqualTo(BigDecimal value) { + addCriterion("surplus_refund_price =", value, "surplusRefundPrice"); return (Criteria) this; } - public Criteria andTotalActualPriceNotEqualTo(BigDecimal value) { - addCriterion("total_actual_price <>", value, "totalActualPrice"); + public Criteria andSurplusRefundPriceNotEqualTo(BigDecimal value) { + addCriterion("surplus_refund_price <>", value, "surplusRefundPrice"); return (Criteria) this; } - public Criteria andTotalActualPriceGreaterThan(BigDecimal value) { - addCriterion("total_actual_price >", value, "totalActualPrice"); + public Criteria andSurplusRefundPriceGreaterThan(BigDecimal value) { + addCriterion("surplus_refund_price >", value, "surplusRefundPrice"); return (Criteria) this; } - public Criteria andTotalActualPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("total_actual_price >=", value, "totalActualPrice"); + public Criteria andSurplusRefundPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("surplus_refund_price >=", value, "surplusRefundPrice"); return (Criteria) this; } - public Criteria andTotalActualPriceLessThan(BigDecimal value) { - addCriterion("total_actual_price <", value, "totalActualPrice"); + public Criteria andSurplusRefundPriceLessThan(BigDecimal value) { + addCriterion("surplus_refund_price <", value, "surplusRefundPrice"); return (Criteria) this; } - public Criteria andTotalActualPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("total_actual_price <=", value, "totalActualPrice"); + public Criteria andSurplusRefundPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("surplus_refund_price <=", value, "surplusRefundPrice"); return (Criteria) this; } - public Criteria andTotalActualPriceIn(List values) { - addCriterion("total_actual_price in", values, "totalActualPrice"); + public Criteria andSurplusRefundPriceIn(List values) { + addCriterion("surplus_refund_price in", values, "surplusRefundPrice"); return (Criteria) this; } - public Criteria andTotalActualPriceNotIn(List values) { - addCriterion("total_actual_price not in", values, "totalActualPrice"); + public Criteria andSurplusRefundPriceNotIn(List values) { + addCriterion("surplus_refund_price not in", values, "surplusRefundPrice"); return (Criteria) this; } - public Criteria andTotalActualPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("total_actual_price between", value1, value2, "totalActualPrice"); + public Criteria andSurplusRefundPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("surplus_refund_price between", value1, value2, "surplusRefundPrice"); return (Criteria) this; } - public Criteria andTotalActualPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("total_actual_price not between", value1, value2, "totalActualPrice"); + public Criteria andSurplusRefundPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("surplus_refund_price not between", value1, value2, "surplusRefundPrice"); return (Criteria) this; } - public Criteria andTotalDeductionPriceIsNull() { - addCriterion("total_deduction_price is null"); + public Criteria andSurplusRefundIntegralIsNull() { + addCriterion("surplus_refund_integral is null"); return (Criteria) this; } - public Criteria andTotalDeductionPriceIsNotNull() { - addCriterion("total_deduction_price is not null"); + public Criteria andSurplusRefundIntegralIsNotNull() { + addCriterion("surplus_refund_integral is not null"); return (Criteria) this; } - public Criteria andTotalDeductionPriceEqualTo(BigDecimal value) { - addCriterion("total_deduction_price =", value, "totalDeductionPrice"); + public Criteria andSurplusRefundIntegralEqualTo(Integer value) { + addCriterion("surplus_refund_integral =", value, "surplusRefundIntegral"); return (Criteria) this; } - public Criteria andTotalDeductionPriceNotEqualTo(BigDecimal value) { - addCriterion("total_deduction_price <>", value, "totalDeductionPrice"); + public Criteria andSurplusRefundIntegralNotEqualTo(Integer value) { + addCriterion("surplus_refund_integral <>", value, "surplusRefundIntegral"); return (Criteria) this; } - public Criteria andTotalDeductionPriceGreaterThan(BigDecimal value) { - addCriterion("total_deduction_price >", value, "totalDeductionPrice"); + public Criteria andSurplusRefundIntegralGreaterThan(Integer value) { + addCriterion("surplus_refund_integral >", value, "surplusRefundIntegral"); return (Criteria) this; } - public Criteria andTotalDeductionPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("total_deduction_price >=", value, "totalDeductionPrice"); + public Criteria andSurplusRefundIntegralGreaterThanOrEqualTo(Integer value) { + addCriterion("surplus_refund_integral >=", value, "surplusRefundIntegral"); return (Criteria) this; } - public Criteria andTotalDeductionPriceLessThan(BigDecimal value) { - addCriterion("total_deduction_price <", value, "totalDeductionPrice"); + public Criteria andSurplusRefundIntegralLessThan(Integer value) { + addCriterion("surplus_refund_integral <", value, "surplusRefundIntegral"); return (Criteria) this; } - public Criteria andTotalDeductionPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("total_deduction_price <=", value, "totalDeductionPrice"); + public Criteria andSurplusRefundIntegralLessThanOrEqualTo(Integer value) { + addCriterion("surplus_refund_integral <=", value, "surplusRefundIntegral"); return (Criteria) this; } - public Criteria andTotalDeductionPriceIn(List values) { - addCriterion("total_deduction_price in", values, "totalDeductionPrice"); + public Criteria andSurplusRefundIntegralIn(List values) { + addCriterion("surplus_refund_integral in", values, "surplusRefundIntegral"); return (Criteria) this; } - public Criteria andTotalDeductionPriceNotIn(List values) { - addCriterion("total_deduction_price not in", values, "totalDeductionPrice"); + public Criteria andSurplusRefundIntegralNotIn(List values) { + addCriterion("surplus_refund_integral not in", values, "surplusRefundIntegral"); return (Criteria) this; } - public Criteria andTotalDeductionPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("total_deduction_price between", value1, value2, "totalDeductionPrice"); + public Criteria andSurplusRefundIntegralBetween(Integer value1, Integer value2) { + addCriterion("surplus_refund_integral between", value1, value2, "surplusRefundIntegral"); return (Criteria) this; } - public Criteria andTotalDeductionPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("total_deduction_price not between", value1, value2, "totalDeductionPrice"); + public Criteria andSurplusRefundIntegralNotBetween(Integer value1, Integer value2) { + addCriterion("surplus_refund_integral not between", value1, value2, "surplusRefundIntegral"); return (Criteria) this; } - public Criteria andSaleCountIsNull() { - addCriterion("sale_count is null"); + public Criteria andChannelOrderNoIsNull() { + addCriterion("channel_order_no is null"); return (Criteria) this; } - public Criteria andSaleCountIsNotNull() { - addCriterion("sale_count is not null"); + public Criteria andChannelOrderNoIsNotNull() { + addCriterion("channel_order_no is not null"); return (Criteria) this; } - public Criteria andSaleCountEqualTo(Integer value) { - addCriterion("sale_count =", value, "saleCount"); + public Criteria andChannelOrderNoEqualTo(String value) { + addCriterion("channel_order_no =", value, "channelOrderNo"); return (Criteria) this; } - public Criteria andSaleCountNotEqualTo(Integer value) { - addCriterion("sale_count <>", value, "saleCount"); + public Criteria andChannelOrderNoNotEqualTo(String value) { + addCriterion("channel_order_no <>", value, "channelOrderNo"); return (Criteria) this; } - public Criteria andSaleCountGreaterThan(Integer value) { - addCriterion("sale_count >", value, "saleCount"); + public Criteria andChannelOrderNoGreaterThan(String value) { + addCriterion("channel_order_no >", value, "channelOrderNo"); return (Criteria) this; } - public Criteria andSaleCountGreaterThanOrEqualTo(Integer value) { - addCriterion("sale_count >=", value, "saleCount"); + public Criteria andChannelOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("channel_order_no >=", value, "channelOrderNo"); return (Criteria) this; } - public Criteria andSaleCountLessThan(Integer value) { - addCriterion("sale_count <", value, "saleCount"); + public Criteria andChannelOrderNoLessThan(String value) { + addCriterion("channel_order_no <", value, "channelOrderNo"); return (Criteria) this; } - public Criteria andSaleCountLessThanOrEqualTo(Integer value) { - addCriterion("sale_count <=", value, "saleCount"); + public Criteria andChannelOrderNoLessThanOrEqualTo(String value) { + addCriterion("channel_order_no <=", value, "channelOrderNo"); return (Criteria) this; } - public Criteria andSaleCountIn(List values) { - addCriterion("sale_count in", values, "saleCount"); + public Criteria andChannelOrderNoLike(String value) { + addCriterion("channel_order_no like", value, "channelOrderNo"); return (Criteria) this; } - public Criteria andSaleCountNotIn(List values) { - addCriterion("sale_count not in", values, "saleCount"); + public Criteria andChannelOrderNoNotLike(String value) { + addCriterion("channel_order_no not like", value, "channelOrderNo"); return (Criteria) this; } - public Criteria andSaleCountBetween(Integer value1, Integer value2) { - addCriterion("sale_count between", value1, value2, "saleCount"); + public Criteria andChannelOrderNoIn(List values) { + addCriterion("channel_order_no in", values, "channelOrderNo"); return (Criteria) this; } - public Criteria andSaleCountNotBetween(Integer value1, Integer value2) { - addCriterion("sale_count not between", value1, value2, "saleCount"); + public Criteria andChannelOrderNoNotIn(List values) { + addCriterion("channel_order_no not in", values, "channelOrderNo"); return (Criteria) this; } - public Criteria andSurplusRefundNumIsNull() { - addCriterion("surplus_refund_num is null"); + public Criteria andChannelOrderNoBetween(String value1, String value2) { + addCriterion("channel_order_no between", value1, value2, "channelOrderNo"); return (Criteria) this; } - public Criteria andSurplusRefundNumIsNotNull() { - addCriterion("surplus_refund_num is not null"); + public Criteria andChannelOrderNoNotBetween(String value1, String value2) { + addCriterion("channel_order_no not between", value1, value2, "channelOrderNo"); return (Criteria) this; } - public Criteria andSurplusRefundNumEqualTo(Integer value) { - addCriterion("surplus_refund_num =", value, "surplusRefundNum"); + public Criteria andTotalPriceIsNull() { + addCriterion("total_price is null"); return (Criteria) this; } - public Criteria andSurplusRefundNumNotEqualTo(Integer value) { - addCriterion("surplus_refund_num <>", value, "surplusRefundNum"); + public Criteria andTotalPriceIsNotNull() { + addCriterion("total_price is not null"); return (Criteria) this; } - public Criteria andSurplusRefundNumGreaterThan(Integer value) { - addCriterion("surplus_refund_num >", value, "surplusRefundNum"); + public Criteria andTotalPriceEqualTo(BigDecimal value) { + addCriterion("total_price =", value, "totalPrice"); return (Criteria) this; } - public Criteria andSurplusRefundNumGreaterThanOrEqualTo(Integer value) { - addCriterion("surplus_refund_num >=", value, "surplusRefundNum"); + public Criteria andTotalPriceNotEqualTo(BigDecimal value) { + addCriterion("total_price <>", value, "totalPrice"); return (Criteria) this; } - public Criteria andSurplusRefundNumLessThan(Integer value) { - addCriterion("surplus_refund_num <", value, "surplusRefundNum"); + public Criteria andTotalPriceGreaterThan(BigDecimal value) { + addCriterion("total_price >", value, "totalPrice"); return (Criteria) this; } - public Criteria andSurplusRefundNumLessThanOrEqualTo(Integer value) { - addCriterion("surplus_refund_num <=", value, "surplusRefundNum"); + public Criteria andTotalPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("total_price >=", value, "totalPrice"); return (Criteria) this; } - public Criteria andSurplusRefundNumIn(List values) { - addCriterion("surplus_refund_num in", values, "surplusRefundNum"); + public Criteria andTotalPriceLessThan(BigDecimal value) { + addCriterion("total_price <", value, "totalPrice"); return (Criteria) this; } - public Criteria andSurplusRefundNumNotIn(List values) { - addCriterion("surplus_refund_num not in", values, "surplusRefundNum"); + public Criteria andTotalPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("total_price <=", value, "totalPrice"); return (Criteria) this; } - public Criteria andSurplusRefundNumBetween(Integer value1, Integer value2) { - addCriterion("surplus_refund_num between", value1, value2, "surplusRefundNum"); + public Criteria andTotalPriceIn(List values) { + addCriterion("total_price in", values, "totalPrice"); return (Criteria) this; } - public Criteria andSurplusRefundNumNotBetween(Integer value1, Integer value2) { - addCriterion("surplus_refund_num not between", value1, value2, "surplusRefundNum"); + public Criteria andTotalPriceNotIn(List values) { + addCriterion("total_price not in", values, "totalPrice"); return (Criteria) this; } - public Criteria andSurplusRefundPriceIsNull() { - addCriterion("surplus_refund_price is null"); + public Criteria andTotalPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_price between", value1, value2, "totalPrice"); return (Criteria) this; } - public Criteria andSurplusRefundPriceIsNotNull() { - addCriterion("surplus_refund_price is not null"); + public Criteria andTotalPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_price not between", value1, value2, "totalPrice"); return (Criteria) this; } - public Criteria andSurplusRefundPriceEqualTo(BigDecimal value) { - addCriterion("surplus_refund_price =", value, "surplusRefundPrice"); + public Criteria andTotalActualPriceIsNull() { + addCriterion("total_actual_price is null"); return (Criteria) this; } - public Criteria andSurplusRefundPriceNotEqualTo(BigDecimal value) { - addCriterion("surplus_refund_price <>", value, "surplusRefundPrice"); + public Criteria andTotalActualPriceIsNotNull() { + addCriterion("total_actual_price is not null"); return (Criteria) this; } - public Criteria andSurplusRefundPriceGreaterThan(BigDecimal value) { - addCriterion("surplus_refund_price >", value, "surplusRefundPrice"); + public Criteria andTotalActualPriceEqualTo(BigDecimal value) { + addCriterion("total_actual_price =", value, "totalActualPrice"); return (Criteria) this; } - public Criteria andSurplusRefundPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("surplus_refund_price >=", value, "surplusRefundPrice"); + public Criteria andTotalActualPriceNotEqualTo(BigDecimal value) { + addCriterion("total_actual_price <>", value, "totalActualPrice"); return (Criteria) this; } - public Criteria andSurplusRefundPriceLessThan(BigDecimal value) { - addCriterion("surplus_refund_price <", value, "surplusRefundPrice"); + public Criteria andTotalActualPriceGreaterThan(BigDecimal value) { + addCriterion("total_actual_price >", value, "totalActualPrice"); return (Criteria) this; } - public Criteria andSurplusRefundPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("surplus_refund_price <=", value, "surplusRefundPrice"); + public Criteria andTotalActualPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("total_actual_price >=", value, "totalActualPrice"); return (Criteria) this; } - public Criteria andSurplusRefundPriceIn(List values) { - addCriterion("surplus_refund_price in", values, "surplusRefundPrice"); + public Criteria andTotalActualPriceLessThan(BigDecimal value) { + addCriterion("total_actual_price <", value, "totalActualPrice"); return (Criteria) this; } - public Criteria andSurplusRefundPriceNotIn(List values) { - addCriterion("surplus_refund_price not in", values, "surplusRefundPrice"); + public Criteria andTotalActualPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("total_actual_price <=", value, "totalActualPrice"); return (Criteria) this; } - public Criteria andSurplusRefundPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("surplus_refund_price between", value1, value2, "surplusRefundPrice"); + public Criteria andTotalActualPriceIn(List values) { + addCriterion("total_actual_price in", values, "totalActualPrice"); return (Criteria) this; } - public Criteria andSurplusRefundPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("surplus_refund_price not between", value1, value2, "surplusRefundPrice"); + public Criteria andTotalActualPriceNotIn(List values) { + addCriterion("total_actual_price not in", values, "totalActualPrice"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralIsNull() { - addCriterion("surplus_refund_integral is null"); + public Criteria andTotalActualPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_actual_price between", value1, value2, "totalActualPrice"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralIsNotNull() { - addCriterion("surplus_refund_integral is not null"); + public Criteria andTotalActualPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_actual_price not between", value1, value2, "totalActualPrice"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralEqualTo(Integer value) { - addCriterion("surplus_refund_integral =", value, "surplusRefundIntegral"); + public Criteria andTotalDeductionPriceIsNull() { + addCriterion("total_deduction_price is null"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralNotEqualTo(Integer value) { - addCriterion("surplus_refund_integral <>", value, "surplusRefundIntegral"); + public Criteria andTotalDeductionPriceIsNotNull() { + addCriterion("total_deduction_price is not null"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralGreaterThan(Integer value) { - addCriterion("surplus_refund_integral >", value, "surplusRefundIntegral"); + public Criteria andTotalDeductionPriceEqualTo(BigDecimal value) { + addCriterion("total_deduction_price =", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralGreaterThanOrEqualTo(Integer value) { - addCriterion("surplus_refund_integral >=", value, "surplusRefundIntegral"); + public Criteria andTotalDeductionPriceNotEqualTo(BigDecimal value) { + addCriterion("total_deduction_price <>", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralLessThan(Integer value) { - addCriterion("surplus_refund_integral <", value, "surplusRefundIntegral"); + public Criteria andTotalDeductionPriceGreaterThan(BigDecimal value) { + addCriterion("total_deduction_price >", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralLessThanOrEqualTo(Integer value) { - addCriterion("surplus_refund_integral <=", value, "surplusRefundIntegral"); + public Criteria andTotalDeductionPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("total_deduction_price >=", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralIn(List values) { - addCriterion("surplus_refund_integral in", values, "surplusRefundIntegral"); + public Criteria andTotalDeductionPriceLessThan(BigDecimal value) { + addCriterion("total_deduction_price <", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralNotIn(List values) { - addCriterion("surplus_refund_integral not in", values, "surplusRefundIntegral"); + public Criteria andTotalDeductionPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("total_deduction_price <=", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralBetween(Integer value1, Integer value2) { - addCriterion("surplus_refund_integral between", value1, value2, "surplusRefundIntegral"); + public Criteria andTotalDeductionPriceIn(List values) { + addCriterion("total_deduction_price in", values, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andSurplusRefundIntegralNotBetween(Integer value1, Integer value2) { - addCriterion("surplus_refund_integral not between", value1, value2, "surplusRefundIntegral"); + public Criteria andTotalDeductionPriceNotIn(List values) { + addCriterion("total_deduction_price not in", values, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andChannelOrderNoIsNull() { - addCriterion("channel_order_no is null"); + public Criteria andTotalDeductionPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_deduction_price between", value1, value2, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andChannelOrderNoIsNotNull() { - addCriterion("channel_order_no is not null"); + public Criteria andTotalDeductionPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_deduction_price not between", value1, value2, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andChannelOrderNoEqualTo(String value) { - addCriterion("channel_order_no =", value, "channelOrderNo"); + public Criteria andSaleCountIsNull() { + addCriterion("sale_count is null"); return (Criteria) this; } - public Criteria andChannelOrderNoNotEqualTo(String value) { - addCriterion("channel_order_no <>", value, "channelOrderNo"); + public Criteria andSaleCountIsNotNull() { + addCriterion("sale_count is not null"); return (Criteria) this; } - public Criteria andChannelOrderNoGreaterThan(String value) { - addCriterion("channel_order_no >", value, "channelOrderNo"); + public Criteria andSaleCountEqualTo(Integer value) { + addCriterion("sale_count =", value, "saleCount"); return (Criteria) this; } - public Criteria andChannelOrderNoGreaterThanOrEqualTo(String value) { - addCriterion("channel_order_no >=", value, "channelOrderNo"); + public Criteria andSaleCountNotEqualTo(Integer value) { + addCriterion("sale_count <>", value, "saleCount"); return (Criteria) this; } - public Criteria andChannelOrderNoLessThan(String value) { - addCriterion("channel_order_no <", value, "channelOrderNo"); + public Criteria andSaleCountGreaterThan(Integer value) { + addCriterion("sale_count >", value, "saleCount"); return (Criteria) this; } - public Criteria andChannelOrderNoLessThanOrEqualTo(String value) { - addCriterion("channel_order_no <=", value, "channelOrderNo"); + public Criteria andSaleCountGreaterThanOrEqualTo(Integer value) { + addCriterion("sale_count >=", value, "saleCount"); return (Criteria) this; } - public Criteria andChannelOrderNoLike(String value) { - addCriterion("channel_order_no like", value, "channelOrderNo"); + public Criteria andSaleCountLessThan(Integer value) { + addCriterion("sale_count <", value, "saleCount"); return (Criteria) this; } - public Criteria andChannelOrderNoNotLike(String value) { - addCriterion("channel_order_no not like", value, "channelOrderNo"); + public Criteria andSaleCountLessThanOrEqualTo(Integer value) { + addCriterion("sale_count <=", value, "saleCount"); return (Criteria) this; } - public Criteria andChannelOrderNoIn(List values) { - addCriterion("channel_order_no in", values, "channelOrderNo"); + public Criteria andSaleCountIn(List values) { + addCriterion("sale_count in", values, "saleCount"); return (Criteria) this; } - public Criteria andChannelOrderNoNotIn(List values) { - addCriterion("channel_order_no not in", values, "channelOrderNo"); + public Criteria andSaleCountNotIn(List values) { + addCriterion("sale_count not in", values, "saleCount"); return (Criteria) this; } - public Criteria andChannelOrderNoBetween(String value1, String value2) { - addCriterion("channel_order_no between", value1, value2, "channelOrderNo"); + public Criteria andSaleCountBetween(Integer value1, Integer value2) { + addCriterion("sale_count between", value1, value2, "saleCount"); return (Criteria) this; } - public Criteria andChannelOrderNoNotBetween(String value1, String value2) { - addCriterion("channel_order_no not between", value1, value2, "channelOrderNo"); + public Criteria andSaleCountNotBetween(Integer value1, Integer value2) { + addCriterion("sale_count not between", value1, value2, "saleCount"); return (Criteria) this; } @@ -2861,4 +2921,4 @@ public class HighChildOrderExample { this(condition, value, secondValue, null); } } -} +} \ No newline at end of file