diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderMapper.java index 2262bd5..9e6377a 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderMapper.java @@ -39,23 +39,27 @@ public interface BsOrderMapper extends BsOrderMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into bs_order (order_no, user_id, ", - "user_phone, img, ", - "goods_name, customParameters, ", - "goods_count, total_price, ", - "promotionAmount, `status`, ", - "create_time, pay_time, ", + "insert into bs_order (user_id, user_name, ", + "user_phone, order_no, ", + "pay_channel, pay_channel_order_no, ", + "pay_serial_no, pay_type, ", + "total_price, pay_real_price, ", + "payment, product_total_price, ", + "create_time, update_time, ", + "pay_time, finish_time, ", "cancel_time, refund_time, ", - "finish_time, update_time, ", + "order_status, remarks, ", "ext_1, ext_2, ext_3)", - "values (#{orderNo,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ", - "#{userPhone,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, ", - "#{goodsName,jdbcType=VARCHAR}, #{customparameters,jdbcType=VARCHAR}, ", - "#{goodsCount,jdbcType=INTEGER}, #{totalPrice,jdbcType=DECIMAL}, ", - "#{promotionamount,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ", + "values (#{userId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, ", + "#{userPhone,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, ", + "#{payChannel,jdbcType=INTEGER}, #{payChannelOrderNo,jdbcType=VARCHAR}, ", + "#{paySerialNo,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", + "#{totalPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ", + "#{payment,jdbcType=DECIMAL}, #{productTotalPrice,jdbcType=DECIMAL}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{payTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ", "#{cancelTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, ", - "#{finishTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{orderStatus,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") @@ -68,22 +72,26 @@ public interface BsOrderMapper extends BsOrderMapperExt { @SelectProvider(type=BsOrderSqlProvider.class, method="selectByExample") @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), + @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), - @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR), - @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR), - @Result(column="customParameters", property="customparameters", jdbcType=JdbcType.VARCHAR), - @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER), + @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER), + @Result(column="pay_channel_order_no", property="payChannelOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="promotionAmount", property="promotionamount", jdbcType=JdbcType.DECIMAL), - @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="payment", property="payment", jdbcType=JdbcType.DECIMAL), + @Result(column="product_total_price", property="productTotalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="order_status", property="orderStatus", jdbcType=JdbcType.INTEGER), + @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) @@ -92,30 +100,35 @@ public interface BsOrderMapper extends BsOrderMapperExt { @Select({ "select", - "id, order_no, user_id, user_phone, img, goods_name, customParameters, goods_count, ", - "total_price, promotionAmount, `status`, create_time, pay_time, cancel_time, ", - "refund_time, finish_time, update_time, ext_1, ext_2, ext_3", + "id, user_id, user_name, user_phone, order_no, pay_channel, pay_channel_order_no, ", + "pay_serial_no, pay_type, total_price, pay_real_price, payment, product_total_price, ", + "create_time, update_time, pay_time, finish_time, cancel_time, refund_time, order_status, ", + "remarks, ext_1, ext_2, ext_3", "from bs_order", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), + @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), - @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR), - @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR), - @Result(column="customParameters", property="customparameters", jdbcType=JdbcType.VARCHAR), - @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER), + @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER), + @Result(column="pay_channel_order_no", property="payChannelOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="promotionAmount", property="promotionamount", jdbcType=JdbcType.DECIMAL), - @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="payment", property="payment", jdbcType=JdbcType.DECIMAL), + @Result(column="product_total_price", property="productTotalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="order_status", property="orderStatus", jdbcType=JdbcType.INTEGER), + @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) @@ -133,22 +146,26 @@ public interface BsOrderMapper extends BsOrderMapperExt { @Update({ "update bs_order", - "set order_no = #{orderNo,jdbcType=VARCHAR},", - "user_id = #{userId,jdbcType=BIGINT},", + "set user_id = #{userId,jdbcType=BIGINT},", + "user_name = #{userName,jdbcType=VARCHAR},", "user_phone = #{userPhone,jdbcType=VARCHAR},", - "img = #{img,jdbcType=VARCHAR},", - "goods_name = #{goodsName,jdbcType=VARCHAR},", - "customParameters = #{customparameters,jdbcType=VARCHAR},", - "goods_count = #{goodsCount,jdbcType=INTEGER},", + "order_no = #{orderNo,jdbcType=VARCHAR},", + "pay_channel = #{payChannel,jdbcType=INTEGER},", + "pay_channel_order_no = #{payChannelOrderNo,jdbcType=VARCHAR},", + "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},", + "pay_type = #{payType,jdbcType=INTEGER},", "total_price = #{totalPrice,jdbcType=DECIMAL},", - "promotionAmount = #{promotionamount,jdbcType=DECIMAL},", - "`status` = #{status,jdbcType=INTEGER},", + "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},", + "payment = #{payment,jdbcType=DECIMAL},", + "product_total_price = #{productTotalPrice,jdbcType=DECIMAL},", "create_time = #{createTime,jdbcType=TIMESTAMP},", + "update_time = #{updateTime,jdbcType=TIMESTAMP},", "pay_time = #{payTime,jdbcType=TIMESTAMP},", + "finish_time = #{finishTime,jdbcType=TIMESTAMP},", "cancel_time = #{cancelTime,jdbcType=TIMESTAMP},", "refund_time = #{refundTime,jdbcType=TIMESTAMP},", - "finish_time = #{finishTime,jdbcType=TIMESTAMP},", - "update_time = #{updateTime,jdbcType=TIMESTAMP},", + "order_status = #{orderStatus,jdbcType=INTEGER},", + "remarks = #{remarks,jdbcType=VARCHAR},", "ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},", "ext_3 = #{ext3,jdbcType=VARCHAR}", diff --git a/service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java index cce9761..aa3e5b8 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java @@ -28,54 +28,70 @@ public class BsOrderSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("bs_order"); - if (record.getOrderNo() != null) { - sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); - } - if (record.getUserId() != null) { sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}"); } + if (record.getUserName() != null) { + sql.VALUES("user_name", "#{userName,jdbcType=VARCHAR}"); + } + if (record.getUserPhone() != null) { sql.VALUES("user_phone", "#{userPhone,jdbcType=VARCHAR}"); } - if (record.getImg() != null) { - sql.VALUES("img", "#{img,jdbcType=VARCHAR}"); + if (record.getOrderNo() != null) { + sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); } - if (record.getGoodsName() != null) { - sql.VALUES("goods_name", "#{goodsName,jdbcType=VARCHAR}"); + if (record.getPayChannel() != null) { + sql.VALUES("pay_channel", "#{payChannel,jdbcType=INTEGER}"); } - if (record.getCustomparameters() != null) { - sql.VALUES("customParameters", "#{customparameters,jdbcType=VARCHAR}"); + if (record.getPayChannelOrderNo() != null) { + sql.VALUES("pay_channel_order_no", "#{payChannelOrderNo,jdbcType=VARCHAR}"); } - if (record.getGoodsCount() != null) { - sql.VALUES("goods_count", "#{goodsCount,jdbcType=INTEGER}"); + if (record.getPaySerialNo() != null) { + sql.VALUES("pay_serial_no", "#{paySerialNo,jdbcType=VARCHAR}"); + } + + if (record.getPayType() != null) { + sql.VALUES("pay_type", "#{payType,jdbcType=INTEGER}"); } if (record.getTotalPrice() != null) { sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}"); } - if (record.getPromotionamount() != null) { - sql.VALUES("promotionAmount", "#{promotionamount,jdbcType=DECIMAL}"); + if (record.getPayRealPrice() != null) { + sql.VALUES("pay_real_price", "#{payRealPrice,jdbcType=DECIMAL}"); } - if (record.getStatus() != null) { - sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); + if (record.getPayment() != null) { + sql.VALUES("payment", "#{payment,jdbcType=DECIMAL}"); + } + + if (record.getProductTotalPrice() != null) { + sql.VALUES("product_total_price", "#{productTotalPrice,jdbcType=DECIMAL}"); } if (record.getCreateTime() != null) { sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); } + if (record.getUpdateTime() != null) { + sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); + } + if (record.getPayTime() != null) { sql.VALUES("pay_time", "#{payTime,jdbcType=TIMESTAMP}"); } + if (record.getFinishTime() != null) { + sql.VALUES("finish_time", "#{finishTime,jdbcType=TIMESTAMP}"); + } + if (record.getCancelTime() != null) { sql.VALUES("cancel_time", "#{cancelTime,jdbcType=TIMESTAMP}"); } @@ -84,12 +100,12 @@ public class BsOrderSqlProvider { sql.VALUES("refund_time", "#{refundTime,jdbcType=TIMESTAMP}"); } - if (record.getFinishTime() != null) { - sql.VALUES("finish_time", "#{finishTime,jdbcType=TIMESTAMP}"); + if (record.getOrderStatus() != null) { + sql.VALUES("order_status", "#{orderStatus,jdbcType=INTEGER}"); } - if (record.getUpdateTime() != null) { - sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); + if (record.getRemarks() != null) { + sql.VALUES("remarks", "#{remarks,jdbcType=VARCHAR}"); } if (record.getExt1() != null) { @@ -114,22 +130,26 @@ public class BsOrderSqlProvider { } else { sql.SELECT("id"); } - sql.SELECT("order_no"); sql.SELECT("user_id"); + sql.SELECT("user_name"); sql.SELECT("user_phone"); - sql.SELECT("img"); - sql.SELECT("goods_name"); - sql.SELECT("customParameters"); - sql.SELECT("goods_count"); + sql.SELECT("order_no"); + sql.SELECT("pay_channel"); + sql.SELECT("pay_channel_order_no"); + sql.SELECT("pay_serial_no"); + sql.SELECT("pay_type"); sql.SELECT("total_price"); - sql.SELECT("promotionAmount"); - sql.SELECT("`status`"); + sql.SELECT("pay_real_price"); + sql.SELECT("payment"); + sql.SELECT("product_total_price"); sql.SELECT("create_time"); + sql.SELECT("update_time"); sql.SELECT("pay_time"); + sql.SELECT("finish_time"); sql.SELECT("cancel_time"); sql.SELECT("refund_time"); - sql.SELECT("finish_time"); - sql.SELECT("update_time"); + sql.SELECT("order_status"); + sql.SELECT("remarks"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); sql.SELECT("ext_3"); @@ -154,54 +174,70 @@ public class BsOrderSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } - if (record.getOrderNo() != null) { - sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); - } - if (record.getUserId() != null) { sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); } + if (record.getUserName() != null) { + sql.SET("user_name = #{record.userName,jdbcType=VARCHAR}"); + } + if (record.getUserPhone() != null) { sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); } - if (record.getImg() != null) { - sql.SET("img = #{record.img,jdbcType=VARCHAR}"); + if (record.getOrderNo() != null) { + sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); + } + + if (record.getPayChannel() != null) { + sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}"); } - if (record.getGoodsName() != null) { - sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}"); + if (record.getPayChannelOrderNo() != null) { + sql.SET("pay_channel_order_no = #{record.payChannelOrderNo,jdbcType=VARCHAR}"); } - if (record.getCustomparameters() != null) { - sql.SET("customParameters = #{record.customparameters,jdbcType=VARCHAR}"); + if (record.getPaySerialNo() != null) { + sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); } - if (record.getGoodsCount() != null) { - sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}"); + if (record.getPayType() != null) { + sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); } if (record.getTotalPrice() != null) { sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); } - if (record.getPromotionamount() != null) { - sql.SET("promotionAmount = #{record.promotionamount,jdbcType=DECIMAL}"); + if (record.getPayRealPrice() != null) { + sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); + } + + if (record.getPayment() != null) { + sql.SET("payment = #{record.payment,jdbcType=DECIMAL}"); } - if (record.getStatus() != null) { - sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + if (record.getProductTotalPrice() != null) { + sql.SET("product_total_price = #{record.productTotalPrice,jdbcType=DECIMAL}"); } if (record.getCreateTime() != null) { sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); } + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + } + if (record.getPayTime() != null) { sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); } + if (record.getFinishTime() != null) { + sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); + } + if (record.getCancelTime() != null) { sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}"); } @@ -210,12 +246,12 @@ public class BsOrderSqlProvider { sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); } - if (record.getFinishTime() != null) { - sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); + if (record.getOrderStatus() != null) { + sql.SET("order_status = #{record.orderStatus,jdbcType=INTEGER}"); } - if (record.getUpdateTime() != null) { - sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + if (record.getRemarks() != null) { + sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); } if (record.getExt1() != null) { @@ -239,22 +275,26 @@ public class BsOrderSqlProvider { sql.UPDATE("bs_order"); sql.SET("id = #{record.id,jdbcType=BIGINT}"); - sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); + sql.SET("user_name = #{record.userName,jdbcType=VARCHAR}"); sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); - sql.SET("img = #{record.img,jdbcType=VARCHAR}"); - sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}"); - sql.SET("customParameters = #{record.customparameters,jdbcType=VARCHAR}"); - sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}"); + sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); + sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}"); + sql.SET("pay_channel_order_no = #{record.payChannelOrderNo,jdbcType=VARCHAR}"); + sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); + sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); - sql.SET("promotionAmount = #{record.promotionamount,jdbcType=DECIMAL}"); - sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); + sql.SET("payment = #{record.payment,jdbcType=DECIMAL}"); + sql.SET("product_total_price = #{record.productTotalPrice,jdbcType=DECIMAL}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); + sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}"); sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); - sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); - sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + sql.SET("order_status = #{record.orderStatus,jdbcType=INTEGER}"); + sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); @@ -268,54 +308,70 @@ public class BsOrderSqlProvider { SQL sql = new SQL(); sql.UPDATE("bs_order"); - if (record.getOrderNo() != null) { - sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); - } - if (record.getUserId() != null) { sql.SET("user_id = #{userId,jdbcType=BIGINT}"); } + if (record.getUserName() != null) { + sql.SET("user_name = #{userName,jdbcType=VARCHAR}"); + } + if (record.getUserPhone() != null) { sql.SET("user_phone = #{userPhone,jdbcType=VARCHAR}"); } - if (record.getImg() != null) { - sql.SET("img = #{img,jdbcType=VARCHAR}"); + if (record.getOrderNo() != null) { + sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); } - if (record.getGoodsName() != null) { - sql.SET("goods_name = #{goodsName,jdbcType=VARCHAR}"); + if (record.getPayChannel() != null) { + sql.SET("pay_channel = #{payChannel,jdbcType=INTEGER}"); } - if (record.getCustomparameters() != null) { - sql.SET("customParameters = #{customparameters,jdbcType=VARCHAR}"); + if (record.getPayChannelOrderNo() != null) { + sql.SET("pay_channel_order_no = #{payChannelOrderNo,jdbcType=VARCHAR}"); } - if (record.getGoodsCount() != null) { - sql.SET("goods_count = #{goodsCount,jdbcType=INTEGER}"); + if (record.getPaySerialNo() != null) { + sql.SET("pay_serial_no = #{paySerialNo,jdbcType=VARCHAR}"); + } + + if (record.getPayType() != null) { + sql.SET("pay_type = #{payType,jdbcType=INTEGER}"); } if (record.getTotalPrice() != null) { sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}"); } - if (record.getPromotionamount() != null) { - sql.SET("promotionAmount = #{promotionamount,jdbcType=DECIMAL}"); + if (record.getPayRealPrice() != null) { + sql.SET("pay_real_price = #{payRealPrice,jdbcType=DECIMAL}"); + } + + if (record.getPayment() != null) { + sql.SET("payment = #{payment,jdbcType=DECIMAL}"); } - if (record.getStatus() != null) { - sql.SET("`status` = #{status,jdbcType=INTEGER}"); + if (record.getProductTotalPrice() != null) { + sql.SET("product_total_price = #{productTotalPrice,jdbcType=DECIMAL}"); } if (record.getCreateTime() != null) { sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); } + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); + } + if (record.getPayTime() != null) { sql.SET("pay_time = #{payTime,jdbcType=TIMESTAMP}"); } + if (record.getFinishTime() != null) { + sql.SET("finish_time = #{finishTime,jdbcType=TIMESTAMP}"); + } + if (record.getCancelTime() != null) { sql.SET("cancel_time = #{cancelTime,jdbcType=TIMESTAMP}"); } @@ -324,12 +380,12 @@ public class BsOrderSqlProvider { sql.SET("refund_time = #{refundTime,jdbcType=TIMESTAMP}"); } - if (record.getFinishTime() != null) { - sql.SET("finish_time = #{finishTime,jdbcType=TIMESTAMP}"); + if (record.getOrderStatus() != null) { + sql.SET("order_status = #{orderStatus,jdbcType=INTEGER}"); } - if (record.getUpdateTime() != null) { - sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); + if (record.getRemarks() != null) { + sql.SET("remarks = #{remarks,jdbcType=VARCHAR}"); } if (record.getExt1() != null) { diff --git a/service/src/main/java/com/hfkj/entity/BsOrder.java b/service/src/main/java/com/hfkj/entity/BsOrder.java index 4a7dbe3..cfee38b 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrder.java +++ b/service/src/main/java/com/hfkj/entity/BsOrder.java @@ -15,19 +15,19 @@ import java.util.Date; **/ public class BsOrder implements Serializable { /** - * 主键 + * 主键ID */ private Long id; /** - * 交易订单号 + * 用户id */ - private String orderNo; + private Long userId; /** - * 用户id + * 用户名称 */ - private Long userId; + private String userName; /** * 用户手机号 @@ -35,50 +35,70 @@ public class BsOrder implements Serializable { private String userPhone; /** - * 图片 + * 订单号 + */ + private String orderNo; + + /** + * 支付渠道 1：惠支付 2：微信合作商 3：贵州银行 4：汇联通 */ - private String img; + private Integer payChannel; /** - * 商品名称 + * 支付渠道流水号 */ - private String goodsName; + private String payChannelOrderNo; /** - * 自定义参数 + * 客户支付流水号 */ - private String customparameters; + private String paySerialNo; /** - * 商品数量 + * 支付方式 1：微信 2: 支付宝 3：快捷支付 4：工会卡 */ - private Integer goodsCount; + private Integer payType; /** - * 交易金额 + * 订单总金额 */ private BigDecimal totalPrice; /** - * 佣金金额 + * 应付金额 + */ + private BigDecimal payRealPrice; + + /** + * 支付金额 */ - private BigDecimal promotionamount; + private BigDecimal payment; /** - * 0-已支付；1-已成团；2-确认收货；3-审核成功；4-审核失败（不可提现）；5-已经结算 ;10-已处罚 + * 商品总金额 */ - private Integer status; + private BigDecimal productTotalPrice; /** * 创建时间 */ private Date createTime; + /** + * 修改时间 + */ + private Date updateTime; + /** * 支付时间 */ private Date payTime; + /** + * 完成时间 + */ + private Date finishTime; + /** * 取消时间 */ @@ -90,14 +110,14 @@ public class BsOrder implements Serializable { private Date refundTime; /** - * 完成时间 + * 订单状态：1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 */ - private Date finishTime; + private Integer orderStatus; /** - * 更新时间 + * 备注 */ - private Date updateTime; + private String remarks; private String ext1; @@ -115,14 +135,6 @@ public class BsOrder implements Serializable { this.id = id; } - public String getOrderNo() { - return orderNo; - } - - public void setOrderNo(String orderNo) { - this.orderNo = orderNo; - } - public Long getUserId() { return userId; } @@ -131,6 +143,14 @@ public class BsOrder implements Serializable { this.userId = userId; } + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + public String getUserPhone() { return userPhone; } @@ -139,36 +159,44 @@ public class BsOrder implements Serializable { this.userPhone = userPhone; } - public String getImg() { - return img; + public String getOrderNo() { + return orderNo; } - public void setImg(String img) { - this.img = img; + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; } - public String getGoodsName() { - return goodsName; + public Integer getPayChannel() { + return payChannel; } - public void setGoodsName(String goodsName) { - this.goodsName = goodsName; + public void setPayChannel(Integer payChannel) { + this.payChannel = payChannel; } - public String getCustomparameters() { - return customparameters; + public String getPayChannelOrderNo() { + return payChannelOrderNo; } - public void setCustomparameters(String customparameters) { - this.customparameters = customparameters; + public void setPayChannelOrderNo(String payChannelOrderNo) { + this.payChannelOrderNo = payChannelOrderNo; } - public Integer getGoodsCount() { - return goodsCount; + public String getPaySerialNo() { + return paySerialNo; } - public void setGoodsCount(Integer goodsCount) { - this.goodsCount = goodsCount; + public void setPaySerialNo(String paySerialNo) { + this.paySerialNo = paySerialNo; + } + + public Integer getPayType() { + return payType; + } + + public void setPayType(Integer payType) { + this.payType = payType; } public BigDecimal getTotalPrice() { @@ -179,20 +207,28 @@ public class BsOrder implements Serializable { this.totalPrice = totalPrice; } - public BigDecimal getPromotionamount() { - return promotionamount; + public BigDecimal getPayRealPrice() { + return payRealPrice; + } + + public void setPayRealPrice(BigDecimal payRealPrice) { + this.payRealPrice = payRealPrice; + } + + public BigDecimal getPayment() { + return payment; } - public void setPromotionamount(BigDecimal promotionamount) { - this.promotionamount = promotionamount; + public void setPayment(BigDecimal payment) { + this.payment = payment; } - public Integer getStatus() { - return status; + public BigDecimal getProductTotalPrice() { + return productTotalPrice; } - public void setStatus(Integer status) { - this.status = status; + public void setProductTotalPrice(BigDecimal productTotalPrice) { + this.productTotalPrice = productTotalPrice; } public Date getCreateTime() { @@ -203,6 +239,14 @@ public class BsOrder implements Serializable { this.createTime = createTime; } + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + public Date getPayTime() { return payTime; } @@ -211,6 +255,14 @@ public class BsOrder implements Serializable { this.payTime = payTime; } + public Date getFinishTime() { + return finishTime; + } + + public void setFinishTime(Date finishTime) { + this.finishTime = finishTime; + } + public Date getCancelTime() { return cancelTime; } @@ -227,20 +279,20 @@ public class BsOrder implements Serializable { this.refundTime = refundTime; } - public Date getFinishTime() { - return finishTime; + public Integer getOrderStatus() { + return orderStatus; } - public void setFinishTime(Date finishTime) { - this.finishTime = finishTime; + public void setOrderStatus(Integer orderStatus) { + this.orderStatus = orderStatus; } - public Date getUpdateTime() { - return updateTime; + public String getRemarks() { + return remarks; } - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; + public void setRemarks(String remarks) { + this.remarks = remarks; } public String getExt1() { @@ -280,22 +332,26 @@ public class BsOrder implements Serializable { } BsOrder other = (BsOrder) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) + && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName())) && (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone())) - && (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg())) - && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName())) - && (this.getCustomparameters() == null ? other.getCustomparameters() == null : this.getCustomparameters().equals(other.getCustomparameters())) - && (this.getGoodsCount() == null ? other.getGoodsCount() == null : this.getGoodsCount().equals(other.getGoodsCount())) + && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) + && (this.getPayChannel() == null ? other.getPayChannel() == null : this.getPayChannel().equals(other.getPayChannel())) + && (this.getPayChannelOrderNo() == null ? other.getPayChannelOrderNo() == null : this.getPayChannelOrderNo().equals(other.getPayChannelOrderNo())) + && (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo())) + && (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType())) && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice())) - && (this.getPromotionamount() == null ? other.getPromotionamount() == null : this.getPromotionamount().equals(other.getPromotionamount())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice())) + && (this.getPayment() == null ? other.getPayment() == null : this.getPayment().equals(other.getPayment())) + && (this.getProductTotalPrice() == null ? other.getProductTotalPrice() == null : this.getProductTotalPrice().equals(other.getProductTotalPrice())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) + && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime())) && (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime())) && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) - && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime())) - && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) + && (this.getOrderStatus() == null ? other.getOrderStatus() == null : this.getOrderStatus().equals(other.getOrderStatus())) + && (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks())) && (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())); @@ -306,22 +362,26 @@ public class BsOrder implements Serializable { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); + result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode()); result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode()); - result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode()); - result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode()); - result = prime * result + ((getCustomparameters() == null) ? 0 : getCustomparameters().hashCode()); - result = prime * result + ((getGoodsCount() == null) ? 0 : getGoodsCount().hashCode()); + result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); + result = prime * result + ((getPayChannel() == null) ? 0 : getPayChannel().hashCode()); + result = prime * result + ((getPayChannelOrderNo() == null) ? 0 : getPayChannelOrderNo().hashCode()); + result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode()); + result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode()); result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode()); - result = prime * result + ((getPromotionamount() == null) ? 0 : getPromotionamount().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode()); + result = prime * result + ((getPayment() == null) ? 0 : getPayment().hashCode()); + result = prime * result + ((getProductTotalPrice() == null) ? 0 : getProductTotalPrice().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); + result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode()); result = prime * result + ((getCancelTime() == null) ? 0 : getCancelTime().hashCode()); result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode()); - result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode()); - result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + result = prime * result + ((getOrderStatus() == null) ? 0 : getOrderStatus().hashCode()); + result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode()); result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); @@ -335,22 +395,26 @@ public class BsOrder implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", orderNo=").append(orderNo); sb.append(", userId=").append(userId); + sb.append(", userName=").append(userName); sb.append(", userPhone=").append(userPhone); - sb.append(", img=").append(img); - sb.append(", goodsName=").append(goodsName); - sb.append(", customparameters=").append(customparameters); - sb.append(", goodsCount=").append(goodsCount); + sb.append(", orderNo=").append(orderNo); + sb.append(", payChannel=").append(payChannel); + sb.append(", payChannelOrderNo=").append(payChannelOrderNo); + sb.append(", paySerialNo=").append(paySerialNo); + sb.append(", payType=").append(payType); sb.append(", totalPrice=").append(totalPrice); - sb.append(", promotionamount=").append(promotionamount); - sb.append(", status=").append(status); + sb.append(", payRealPrice=").append(payRealPrice); + sb.append(", payment=").append(payment); + sb.append(", productTotalPrice=").append(productTotalPrice); sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); sb.append(", payTime=").append(payTime); + sb.append(", finishTime=").append(finishTime); sb.append(", cancelTime=").append(cancelTime); sb.append(", refundTime=").append(refundTime); - sb.append(", finishTime=").append(finishTime); - sb.append(", updateTime=").append(updateTime); + sb.append(", orderStatus=").append(orderStatus); + sb.append(", remarks=").append(remarks); sb.append(", ext1=").append(ext1); sb.append(", ext2=").append(ext2); sb.append(", ext3=").append(ext3); diff --git a/service/src/main/java/com/hfkj/entity/BsOrderExample.java b/service/src/main/java/com/hfkj/entity/BsOrderExample.java index 4e9a40a..9c98c82 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderExample.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderExample.java @@ -186,133 +186,133 @@ public class BsOrderExample { return (Criteria) this; } - public Criteria andOrderNoIsNull() { - addCriterion("order_no is null"); + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); return (Criteria) this; } - public Criteria andOrderNoIsNotNull() { - addCriterion("order_no is not null"); + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); return (Criteria) this; } - public Criteria andOrderNoEqualTo(String value) { - addCriterion("order_no =", value, "orderNo"); + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); return (Criteria) this; } - public Criteria andOrderNoNotEqualTo(String value) { - addCriterion("order_no <>", value, "orderNo"); + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); return (Criteria) this; } - public Criteria andOrderNoGreaterThan(String value) { - addCriterion("order_no >", value, "orderNo"); + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); return (Criteria) this; } - public Criteria andOrderNoGreaterThanOrEqualTo(String value) { - addCriterion("order_no >=", value, "orderNo"); + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); return (Criteria) this; } - public Criteria andOrderNoLessThan(String value) { - addCriterion("order_no <", value, "orderNo"); + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); return (Criteria) this; } - public Criteria andOrderNoLessThanOrEqualTo(String value) { - addCriterion("order_no <=", value, "orderNo"); + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); return (Criteria) this; } - public Criteria andOrderNoLike(String value) { - addCriterion("order_no like", value, "orderNo"); + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); return (Criteria) this; } - public Criteria andOrderNoNotLike(String value) { - addCriterion("order_no not like", value, "orderNo"); + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); return (Criteria) this; } - public Criteria andOrderNoIn(List values) { - addCriterion("order_no in", values, "orderNo"); + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); return (Criteria) this; } - public Criteria andOrderNoNotIn(List values) { - addCriterion("order_no not in", values, "orderNo"); + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); return (Criteria) this; } - public Criteria andOrderNoBetween(String value1, String value2) { - addCriterion("order_no between", value1, value2, "orderNo"); + public Criteria andUserNameIsNull() { + addCriterion("user_name is null"); return (Criteria) this; } - public Criteria andOrderNoNotBetween(String value1, String value2) { - addCriterion("order_no not between", value1, value2, "orderNo"); + public Criteria andUserNameIsNotNull() { + addCriterion("user_name is not null"); return (Criteria) this; } - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); + public Criteria andUserNameEqualTo(String value) { + addCriterion("user_name =", value, "userName"); return (Criteria) this; } - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); + public Criteria andUserNameNotEqualTo(String value) { + addCriterion("user_name <>", value, "userName"); return (Criteria) this; } - public Criteria andUserIdEqualTo(Long value) { - addCriterion("user_id =", value, "userId"); + public Criteria andUserNameGreaterThan(String value) { + addCriterion("user_name >", value, "userName"); return (Criteria) this; } - public Criteria andUserIdNotEqualTo(Long value) { - addCriterion("user_id <>", value, "userId"); + public Criteria andUserNameGreaterThanOrEqualTo(String value) { + addCriterion("user_name >=", value, "userName"); return (Criteria) this; } - public Criteria andUserIdGreaterThan(Long value) { - addCriterion("user_id >", value, "userId"); + public Criteria andUserNameLessThan(String value) { + addCriterion("user_name <", value, "userName"); return (Criteria) this; } - public Criteria andUserIdGreaterThanOrEqualTo(Long value) { - addCriterion("user_id >=", value, "userId"); + public Criteria andUserNameLessThanOrEqualTo(String value) { + addCriterion("user_name <=", value, "userName"); return (Criteria) this; } - public Criteria andUserIdLessThan(Long value) { - addCriterion("user_id <", value, "userId"); + public Criteria andUserNameLike(String value) { + addCriterion("user_name like", value, "userName"); return (Criteria) this; } - public Criteria andUserIdLessThanOrEqualTo(Long value) { - addCriterion("user_id <=", value, "userId"); + public Criteria andUserNameNotLike(String value) { + addCriterion("user_name not like", value, "userName"); return (Criteria) this; } - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); + public Criteria andUserNameIn(List values) { + addCriterion("user_name in", values, "userName"); return (Criteria) this; } - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); + public Criteria andUserNameNotIn(List values) { + addCriterion("user_name not in", values, "userName"); return (Criteria) this; } - public Criteria andUserIdBetween(Long value1, Long value2) { - addCriterion("user_id between", value1, value2, "userId"); + public Criteria andUserNameBetween(String value1, String value2) { + addCriterion("user_name between", value1, value2, "userName"); return (Criteria) this; } - public Criteria andUserIdNotBetween(Long value1, Long value2) { - addCriterion("user_id not between", value1, value2, "userId"); + public Criteria andUserNameNotBetween(String value1, String value2) { + addCriterion("user_name not between", value1, value2, "userName"); return (Criteria) this; } @@ -386,273 +386,333 @@ public class BsOrderExample { return (Criteria) this; } - public Criteria andImgIsNull() { - addCriterion("img is null"); + public Criteria andOrderNoIsNull() { + addCriterion("order_no is null"); return (Criteria) this; } - public Criteria andImgIsNotNull() { - addCriterion("img is not null"); + public Criteria andOrderNoIsNotNull() { + addCriterion("order_no is not null"); return (Criteria) this; } - public Criteria andImgEqualTo(String value) { - addCriterion("img =", value, "img"); + public Criteria andOrderNoEqualTo(String value) { + addCriterion("order_no =", value, "orderNo"); return (Criteria) this; } - public Criteria andImgNotEqualTo(String value) { - addCriterion("img <>", value, "img"); + public Criteria andOrderNoNotEqualTo(String value) { + addCriterion("order_no <>", value, "orderNo"); return (Criteria) this; } - public Criteria andImgGreaterThan(String value) { - addCriterion("img >", value, "img"); + public Criteria andOrderNoGreaterThan(String value) { + addCriterion("order_no >", value, "orderNo"); return (Criteria) this; } - public Criteria andImgGreaterThanOrEqualTo(String value) { - addCriterion("img >=", value, "img"); + public Criteria andOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("order_no >=", value, "orderNo"); return (Criteria) this; } - public Criteria andImgLessThan(String value) { - addCriterion("img <", value, "img"); + public Criteria andOrderNoLessThan(String value) { + addCriterion("order_no <", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThanOrEqualTo(String value) { + addCriterion("order_no <=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLike(String value) { + addCriterion("order_no like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotLike(String value) { + addCriterion("order_no not like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoIn(List values) { + addCriterion("order_no in", values, "orderNo"); return (Criteria) this; } - public Criteria andImgLessThanOrEqualTo(String value) { - addCriterion("img <=", value, "img"); + public Criteria andOrderNoNotIn(List values) { + addCriterion("order_no not in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoBetween(String value1, String value2) { + addCriterion("order_no between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotBetween(String value1, String value2) { + addCriterion("order_no not between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andPayChannelIsNull() { + addCriterion("pay_channel is null"); return (Criteria) this; } - public Criteria andImgLike(String value) { - addCriterion("img like", value, "img"); + public Criteria andPayChannelIsNotNull() { + addCriterion("pay_channel is not null"); return (Criteria) this; } - public Criteria andImgNotLike(String value) { - addCriterion("img not like", value, "img"); + public Criteria andPayChannelEqualTo(Integer value) { + addCriterion("pay_channel =", value, "payChannel"); return (Criteria) this; } - public Criteria andImgIn(List values) { - addCriterion("img in", values, "img"); + public Criteria andPayChannelNotEqualTo(Integer value) { + addCriterion("pay_channel <>", value, "payChannel"); return (Criteria) this; } - public Criteria andImgNotIn(List values) { - addCriterion("img not in", values, "img"); + public Criteria andPayChannelGreaterThan(Integer value) { + addCriterion("pay_channel >", value, "payChannel"); return (Criteria) this; } - public Criteria andImgBetween(String value1, String value2) { - addCriterion("img between", value1, value2, "img"); + public Criteria andPayChannelGreaterThanOrEqualTo(Integer value) { + addCriterion("pay_channel >=", value, "payChannel"); return (Criteria) this; } - public Criteria andImgNotBetween(String value1, String value2) { - addCriterion("img not between", value1, value2, "img"); + public Criteria andPayChannelLessThan(Integer value) { + addCriterion("pay_channel <", value, "payChannel"); return (Criteria) this; } - public Criteria andGoodsNameIsNull() { - addCriterion("goods_name is null"); + public Criteria andPayChannelLessThanOrEqualTo(Integer value) { + addCriterion("pay_channel <=", value, "payChannel"); return (Criteria) this; } - public Criteria andGoodsNameIsNotNull() { - addCriterion("goods_name is not null"); + public Criteria andPayChannelIn(List values) { + addCriterion("pay_channel in", values, "payChannel"); return (Criteria) this; } - public Criteria andGoodsNameEqualTo(String value) { - addCriterion("goods_name =", value, "goodsName"); + public Criteria andPayChannelNotIn(List values) { + addCriterion("pay_channel not in", values, "payChannel"); return (Criteria) this; } - public Criteria andGoodsNameNotEqualTo(String value) { - addCriterion("goods_name <>", value, "goodsName"); + public Criteria andPayChannelBetween(Integer value1, Integer value2) { + addCriterion("pay_channel between", value1, value2, "payChannel"); return (Criteria) this; } - public Criteria andGoodsNameGreaterThan(String value) { - addCriterion("goods_name >", value, "goodsName"); + public Criteria andPayChannelNotBetween(Integer value1, Integer value2) { + addCriterion("pay_channel not between", value1, value2, "payChannel"); return (Criteria) this; } - public Criteria andGoodsNameGreaterThanOrEqualTo(String value) { - addCriterion("goods_name >=", value, "goodsName"); + public Criteria andPayChannelOrderNoIsNull() { + addCriterion("pay_channel_order_no is null"); return (Criteria) this; } - public Criteria andGoodsNameLessThan(String value) { - addCriterion("goods_name <", value, "goodsName"); + public Criteria andPayChannelOrderNoIsNotNull() { + addCriterion("pay_channel_order_no is not null"); return (Criteria) this; } - public Criteria andGoodsNameLessThanOrEqualTo(String value) { - addCriterion("goods_name <=", value, "goodsName"); + public Criteria andPayChannelOrderNoEqualTo(String value) { + addCriterion("pay_channel_order_no =", value, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andGoodsNameLike(String value) { - addCriterion("goods_name like", value, "goodsName"); + public Criteria andPayChannelOrderNoNotEqualTo(String value) { + addCriterion("pay_channel_order_no <>", value, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andGoodsNameNotLike(String value) { - addCriterion("goods_name not like", value, "goodsName"); + public Criteria andPayChannelOrderNoGreaterThan(String value) { + addCriterion("pay_channel_order_no >", value, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andGoodsNameIn(List values) { - addCriterion("goods_name in", values, "goodsName"); + public Criteria andPayChannelOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("pay_channel_order_no >=", value, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andGoodsNameNotIn(List values) { - addCriterion("goods_name not in", values, "goodsName"); + public Criteria andPayChannelOrderNoLessThan(String value) { + addCriterion("pay_channel_order_no <", value, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andGoodsNameBetween(String value1, String value2) { - addCriterion("goods_name between", value1, value2, "goodsName"); + public Criteria andPayChannelOrderNoLessThanOrEqualTo(String value) { + addCriterion("pay_channel_order_no <=", value, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andGoodsNameNotBetween(String value1, String value2) { - addCriterion("goods_name not between", value1, value2, "goodsName"); + public Criteria andPayChannelOrderNoLike(String value) { + addCriterion("pay_channel_order_no like", value, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andCustomparametersIsNull() { - addCriterion("customParameters is null"); + public Criteria andPayChannelOrderNoNotLike(String value) { + addCriterion("pay_channel_order_no not like", value, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andCustomparametersIsNotNull() { - addCriterion("customParameters is not null"); + public Criteria andPayChannelOrderNoIn(List values) { + addCriterion("pay_channel_order_no in", values, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andCustomparametersEqualTo(String value) { - addCriterion("customParameters =", value, "customparameters"); + public Criteria andPayChannelOrderNoNotIn(List values) { + addCriterion("pay_channel_order_no not in", values, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andCustomparametersNotEqualTo(String value) { - addCriterion("customParameters <>", value, "customparameters"); + public Criteria andPayChannelOrderNoBetween(String value1, String value2) { + addCriterion("pay_channel_order_no between", value1, value2, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andCustomparametersGreaterThan(String value) { - addCriterion("customParameters >", value, "customparameters"); + public Criteria andPayChannelOrderNoNotBetween(String value1, String value2) { + addCriterion("pay_channel_order_no not between", value1, value2, "payChannelOrderNo"); return (Criteria) this; } - public Criteria andCustomparametersGreaterThanOrEqualTo(String value) { - addCriterion("customParameters >=", value, "customparameters"); + public Criteria andPaySerialNoIsNull() { + addCriterion("pay_serial_no is null"); return (Criteria) this; } - public Criteria andCustomparametersLessThan(String value) { - addCriterion("customParameters <", value, "customparameters"); + public Criteria andPaySerialNoIsNotNull() { + addCriterion("pay_serial_no is not null"); return (Criteria) this; } - public Criteria andCustomparametersLessThanOrEqualTo(String value) { - addCriterion("customParameters <=", value, "customparameters"); + public Criteria andPaySerialNoEqualTo(String value) { + addCriterion("pay_serial_no =", value, "paySerialNo"); return (Criteria) this; } - public Criteria andCustomparametersLike(String value) { - addCriterion("customParameters like", value, "customparameters"); + public Criteria andPaySerialNoNotEqualTo(String value) { + addCriterion("pay_serial_no <>", value, "paySerialNo"); return (Criteria) this; } - public Criteria andCustomparametersNotLike(String value) { - addCriterion("customParameters not like", value, "customparameters"); + public Criteria andPaySerialNoGreaterThan(String value) { + addCriterion("pay_serial_no >", value, "paySerialNo"); return (Criteria) this; } - public Criteria andCustomparametersIn(List values) { - addCriterion("customParameters in", values, "customparameters"); + public Criteria andPaySerialNoGreaterThanOrEqualTo(String value) { + addCriterion("pay_serial_no >=", value, "paySerialNo"); return (Criteria) this; } - public Criteria andCustomparametersNotIn(List values) { - addCriterion("customParameters not in", values, "customparameters"); + public Criteria andPaySerialNoLessThan(String value) { + addCriterion("pay_serial_no <", value, "paySerialNo"); return (Criteria) this; } - public Criteria andCustomparametersBetween(String value1, String value2) { - addCriterion("customParameters between", value1, value2, "customparameters"); + public Criteria andPaySerialNoLessThanOrEqualTo(String value) { + addCriterion("pay_serial_no <=", value, "paySerialNo"); return (Criteria) this; } - public Criteria andCustomparametersNotBetween(String value1, String value2) { - addCriterion("customParameters not between", value1, value2, "customparameters"); + public Criteria andPaySerialNoLike(String value) { + addCriterion("pay_serial_no like", value, "paySerialNo"); return (Criteria) this; } - public Criteria andGoodsCountIsNull() { - addCriterion("goods_count is null"); + public Criteria andPaySerialNoNotLike(String value) { + addCriterion("pay_serial_no not like", value, "paySerialNo"); return (Criteria) this; } - public Criteria andGoodsCountIsNotNull() { - addCriterion("goods_count is not null"); + public Criteria andPaySerialNoIn(List values) { + addCriterion("pay_serial_no in", values, "paySerialNo"); return (Criteria) this; } - public Criteria andGoodsCountEqualTo(Integer value) { - addCriterion("goods_count =", value, "goodsCount"); + public Criteria andPaySerialNoNotIn(List values) { + addCriterion("pay_serial_no not in", values, "paySerialNo"); return (Criteria) this; } - public Criteria andGoodsCountNotEqualTo(Integer value) { - addCriterion("goods_count <>", value, "goodsCount"); + public Criteria andPaySerialNoBetween(String value1, String value2) { + addCriterion("pay_serial_no between", value1, value2, "paySerialNo"); return (Criteria) this; } - public Criteria andGoodsCountGreaterThan(Integer value) { - addCriterion("goods_count >", value, "goodsCount"); + public Criteria andPaySerialNoNotBetween(String value1, String value2) { + addCriterion("pay_serial_no not between", value1, value2, "paySerialNo"); return (Criteria) this; } - public Criteria andGoodsCountGreaterThanOrEqualTo(Integer value) { - addCriterion("goods_count >=", value, "goodsCount"); + public Criteria andPayTypeIsNull() { + addCriterion("pay_type is null"); return (Criteria) this; } - public Criteria andGoodsCountLessThan(Integer value) { - addCriterion("goods_count <", value, "goodsCount"); + public Criteria andPayTypeIsNotNull() { + addCriterion("pay_type is not null"); return (Criteria) this; } - public Criteria andGoodsCountLessThanOrEqualTo(Integer value) { - addCriterion("goods_count <=", value, "goodsCount"); + public Criteria andPayTypeEqualTo(Integer value) { + addCriterion("pay_type =", value, "payType"); return (Criteria) this; } - public Criteria andGoodsCountIn(List values) { - addCriterion("goods_count in", values, "goodsCount"); + public Criteria andPayTypeNotEqualTo(Integer value) { + addCriterion("pay_type <>", value, "payType"); return (Criteria) this; } - public Criteria andGoodsCountNotIn(List values) { - addCriterion("goods_count not in", values, "goodsCount"); + public Criteria andPayTypeGreaterThan(Integer value) { + addCriterion("pay_type >", value, "payType"); return (Criteria) this; } - public Criteria andGoodsCountBetween(Integer value1, Integer value2) { - addCriterion("goods_count between", value1, value2, "goodsCount"); + public Criteria andPayTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("pay_type >=", value, "payType"); return (Criteria) this; } - public Criteria andGoodsCountNotBetween(Integer value1, Integer value2) { - addCriterion("goods_count not between", value1, value2, "goodsCount"); + public Criteria andPayTypeLessThan(Integer value) { + addCriterion("pay_type <", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeLessThanOrEqualTo(Integer value) { + addCriterion("pay_type <=", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeIn(List values) { + addCriterion("pay_type in", values, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeNotIn(List values) { + addCriterion("pay_type not in", values, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeBetween(Integer value1, Integer value2) { + addCriterion("pay_type between", value1, value2, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeNotBetween(Integer value1, Integer value2) { + addCriterion("pay_type not between", value1, value2, "payType"); return (Criteria) this; } @@ -716,123 +776,183 @@ public class BsOrderExample { return (Criteria) this; } - public Criteria andPromotionamountIsNull() { - addCriterion("promotionAmount is null"); + public Criteria andPayRealPriceIsNull() { + addCriterion("pay_real_price is null"); + return (Criteria) this; + } + + public Criteria andPayRealPriceIsNotNull() { + addCriterion("pay_real_price is not null"); + return (Criteria) this; + } + + public Criteria andPayRealPriceEqualTo(BigDecimal value) { + addCriterion("pay_real_price =", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceNotEqualTo(BigDecimal value) { + addCriterion("pay_real_price <>", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceGreaterThan(BigDecimal value) { + addCriterion("pay_real_price >", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("pay_real_price >=", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceLessThan(BigDecimal value) { + addCriterion("pay_real_price <", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("pay_real_price <=", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceIn(List values) { + addCriterion("pay_real_price in", values, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceNotIn(List values) { + addCriterion("pay_real_price not in", values, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_real_price between", value1, value2, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_real_price not between", value1, value2, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPaymentIsNull() { + addCriterion("payment is null"); return (Criteria) this; } - public Criteria andPromotionamountIsNotNull() { - addCriterion("promotionAmount is not null"); + public Criteria andPaymentIsNotNull() { + addCriterion("payment is not null"); return (Criteria) this; } - public Criteria andPromotionamountEqualTo(BigDecimal value) { - addCriterion("promotionAmount =", value, "promotionamount"); + public Criteria andPaymentEqualTo(BigDecimal value) { + addCriterion("payment =", value, "payment"); return (Criteria) this; } - public Criteria andPromotionamountNotEqualTo(BigDecimal value) { - addCriterion("promotionAmount <>", value, "promotionamount"); + public Criteria andPaymentNotEqualTo(BigDecimal value) { + addCriterion("payment <>", value, "payment"); return (Criteria) this; } - public Criteria andPromotionamountGreaterThan(BigDecimal value) { - addCriterion("promotionAmount >", value, "promotionamount"); + public Criteria andPaymentGreaterThan(BigDecimal value) { + addCriterion("payment >", value, "payment"); return (Criteria) this; } - public Criteria andPromotionamountGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("promotionAmount >=", value, "promotionamount"); + public Criteria andPaymentGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("payment >=", value, "payment"); return (Criteria) this; } - public Criteria andPromotionamountLessThan(BigDecimal value) { - addCriterion("promotionAmount <", value, "promotionamount"); + public Criteria andPaymentLessThan(BigDecimal value) { + addCriterion("payment <", value, "payment"); return (Criteria) this; } - public Criteria andPromotionamountLessThanOrEqualTo(BigDecimal value) { - addCriterion("promotionAmount <=", value, "promotionamount"); + public Criteria andPaymentLessThanOrEqualTo(BigDecimal value) { + addCriterion("payment <=", value, "payment"); return (Criteria) this; } - public Criteria andPromotionamountIn(List values) { - addCriterion("promotionAmount in", values, "promotionamount"); + public Criteria andPaymentIn(List values) { + addCriterion("payment in", values, "payment"); return (Criteria) this; } - public Criteria andPromotionamountNotIn(List values) { - addCriterion("promotionAmount not in", values, "promotionamount"); + public Criteria andPaymentNotIn(List values) { + addCriterion("payment not in", values, "payment"); return (Criteria) this; } - public Criteria andPromotionamountBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("promotionAmount between", value1, value2, "promotionamount"); + public Criteria andPaymentBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("payment between", value1, value2, "payment"); return (Criteria) this; } - public Criteria andPromotionamountNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("promotionAmount not between", value1, value2, "promotionamount"); + public Criteria andPaymentNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("payment not between", value1, value2, "payment"); return (Criteria) this; } - public Criteria andStatusIsNull() { - addCriterion("`status` is null"); + public Criteria andProductTotalPriceIsNull() { + addCriterion("product_total_price is null"); return (Criteria) this; } - public Criteria andStatusIsNotNull() { - addCriterion("`status` is not null"); + public Criteria andProductTotalPriceIsNotNull() { + addCriterion("product_total_price is not null"); return (Criteria) this; } - public Criteria andStatusEqualTo(Integer value) { - addCriterion("`status` =", value, "status"); + public Criteria andProductTotalPriceEqualTo(BigDecimal value) { + addCriterion("product_total_price =", value, "productTotalPrice"); return (Criteria) this; } - public Criteria andStatusNotEqualTo(Integer value) { - addCriterion("`status` <>", value, "status"); + public Criteria andProductTotalPriceNotEqualTo(BigDecimal value) { + addCriterion("product_total_price <>", value, "productTotalPrice"); return (Criteria) this; } - public Criteria andStatusGreaterThan(Integer value) { - addCriterion("`status` >", value, "status"); + public Criteria andProductTotalPriceGreaterThan(BigDecimal value) { + addCriterion("product_total_price >", value, "productTotalPrice"); return (Criteria) this; } - public Criteria andStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("`status` >=", value, "status"); + public Criteria andProductTotalPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("product_total_price >=", value, "productTotalPrice"); return (Criteria) this; } - public Criteria andStatusLessThan(Integer value) { - addCriterion("`status` <", value, "status"); + public Criteria andProductTotalPriceLessThan(BigDecimal value) { + addCriterion("product_total_price <", value, "productTotalPrice"); return (Criteria) this; } - public Criteria andStatusLessThanOrEqualTo(Integer value) { - addCriterion("`status` <=", value, "status"); + public Criteria andProductTotalPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("product_total_price <=", value, "productTotalPrice"); return (Criteria) this; } - public Criteria andStatusIn(List values) { - addCriterion("`status` in", values, "status"); + public Criteria andProductTotalPriceIn(List values) { + addCriterion("product_total_price in", values, "productTotalPrice"); return (Criteria) this; } - public Criteria andStatusNotIn(List values) { - addCriterion("`status` not in", values, "status"); + public Criteria andProductTotalPriceNotIn(List values) { + addCriterion("product_total_price not in", values, "productTotalPrice"); return (Criteria) this; } - public Criteria andStatusBetween(Integer value1, Integer value2) { - addCriterion("`status` between", value1, value2, "status"); + public Criteria andProductTotalPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("product_total_price between", value1, value2, "productTotalPrice"); return (Criteria) this; } - public Criteria andStatusNotBetween(Integer value1, Integer value2) { - addCriterion("`status` not between", value1, value2, "status"); + public Criteria andProductTotalPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("product_total_price not between", value1, value2, "productTotalPrice"); return (Criteria) this; } @@ -896,6 +1016,66 @@ public class BsOrderExample { return (Criteria) this; } + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + public Criteria andPayTimeIsNull() { addCriterion("pay_time is null"); return (Criteria) this; @@ -956,6 +1136,66 @@ public class BsOrderExample { return (Criteria) this; } + public Criteria andFinishTimeIsNull() { + addCriterion("finish_time is null"); + return (Criteria) this; + } + + public Criteria andFinishTimeIsNotNull() { + addCriterion("finish_time is not null"); + return (Criteria) this; + } + + public Criteria andFinishTimeEqualTo(Date value) { + addCriterion("finish_time =", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotEqualTo(Date value) { + addCriterion("finish_time <>", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeGreaterThan(Date value) { + addCriterion("finish_time >", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeGreaterThanOrEqualTo(Date value) { + addCriterion("finish_time >=", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeLessThan(Date value) { + addCriterion("finish_time <", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeLessThanOrEqualTo(Date value) { + addCriterion("finish_time <=", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeIn(List values) { + addCriterion("finish_time in", values, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotIn(List values) { + addCriterion("finish_time not in", values, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeBetween(Date value1, Date value2) { + addCriterion("finish_time between", value1, value2, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotBetween(Date value1, Date value2) { + addCriterion("finish_time not between", value1, value2, "finishTime"); + return (Criteria) this; + } + public Criteria andCancelTimeIsNull() { addCriterion("cancel_time is null"); return (Criteria) this; @@ -1076,123 +1316,133 @@ public class BsOrderExample { return (Criteria) this; } - public Criteria andFinishTimeIsNull() { - addCriterion("finish_time is null"); + public Criteria andOrderStatusIsNull() { + addCriterion("order_status is null"); return (Criteria) this; } - public Criteria andFinishTimeIsNotNull() { - addCriterion("finish_time is not null"); + public Criteria andOrderStatusIsNotNull() { + addCriterion("order_status is not null"); return (Criteria) this; } - public Criteria andFinishTimeEqualTo(Date value) { - addCriterion("finish_time =", value, "finishTime"); + public Criteria andOrderStatusEqualTo(Integer value) { + addCriterion("order_status =", value, "orderStatus"); return (Criteria) this; } - public Criteria andFinishTimeNotEqualTo(Date value) { - addCriterion("finish_time <>", value, "finishTime"); + public Criteria andOrderStatusNotEqualTo(Integer value) { + addCriterion("order_status <>", value, "orderStatus"); return (Criteria) this; } - public Criteria andFinishTimeGreaterThan(Date value) { - addCriterion("finish_time >", value, "finishTime"); + public Criteria andOrderStatusGreaterThan(Integer value) { + addCriterion("order_status >", value, "orderStatus"); return (Criteria) this; } - public Criteria andFinishTimeGreaterThanOrEqualTo(Date value) { - addCriterion("finish_time >=", value, "finishTime"); + public Criteria andOrderStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("order_status >=", value, "orderStatus"); return (Criteria) this; } - public Criteria andFinishTimeLessThan(Date value) { - addCriterion("finish_time <", value, "finishTime"); + public Criteria andOrderStatusLessThan(Integer value) { + addCriterion("order_status <", value, "orderStatus"); return (Criteria) this; } - public Criteria andFinishTimeLessThanOrEqualTo(Date value) { - addCriterion("finish_time <=", value, "finishTime"); + public Criteria andOrderStatusLessThanOrEqualTo(Integer value) { + addCriterion("order_status <=", value, "orderStatus"); return (Criteria) this; } - public Criteria andFinishTimeIn(List values) { - addCriterion("finish_time in", values, "finishTime"); + public Criteria andOrderStatusIn(List values) { + addCriterion("order_status in", values, "orderStatus"); return (Criteria) this; } - public Criteria andFinishTimeNotIn(List values) { - addCriterion("finish_time not in", values, "finishTime"); + public Criteria andOrderStatusNotIn(List values) { + addCriterion("order_status not in", values, "orderStatus"); return (Criteria) this; } - public Criteria andFinishTimeBetween(Date value1, Date value2) { - addCriterion("finish_time between", value1, value2, "finishTime"); + public Criteria andOrderStatusBetween(Integer value1, Integer value2) { + addCriterion("order_status between", value1, value2, "orderStatus"); return (Criteria) this; } - public Criteria andFinishTimeNotBetween(Date value1, Date value2) { - addCriterion("finish_time not between", value1, value2, "finishTime"); + public Criteria andOrderStatusNotBetween(Integer value1, Integer value2) { + addCriterion("order_status not between", value1, value2, "orderStatus"); return (Criteria) this; } - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); + public Criteria andRemarksIsNull() { + addCriterion("remarks is null"); return (Criteria) this; } - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); + public Criteria andRemarksIsNotNull() { + addCriterion("remarks is not null"); return (Criteria) this; } - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); + public Criteria andRemarksEqualTo(String value) { + addCriterion("remarks =", value, "remarks"); return (Criteria) this; } - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); + public Criteria andRemarksNotEqualTo(String value) { + addCriterion("remarks <>", value, "remarks"); return (Criteria) this; } - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); + public Criteria andRemarksGreaterThan(String value) { + addCriterion("remarks >", value, "remarks"); return (Criteria) this; } - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); + public Criteria andRemarksGreaterThanOrEqualTo(String value) { + addCriterion("remarks >=", value, "remarks"); return (Criteria) this; } - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); + public Criteria andRemarksLessThan(String value) { + addCriterion("remarks <", value, "remarks"); return (Criteria) this; } - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); + public Criteria andRemarksLessThanOrEqualTo(String value) { + addCriterion("remarks <=", value, "remarks"); return (Criteria) this; } - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); + public Criteria andRemarksLike(String value) { + addCriterion("remarks like", value, "remarks"); return (Criteria) this; } - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); + public Criteria andRemarksNotLike(String value) { + addCriterion("remarks not like", value, "remarks"); return (Criteria) this; } - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); + public Criteria andRemarksIn(List values) { + addCriterion("remarks in", values, "remarks"); return (Criteria) this; } - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); + public Criteria andRemarksNotIn(List values) { + addCriterion("remarks not in", values, "remarks"); + return (Criteria) this; + } + + public Criteria andRemarksBetween(String value1, String value2) { + addCriterion("remarks between", value1, value2, "remarks"); + return (Criteria) this; + } + + public Criteria andRemarksNotBetween(String value1, String value2) { + addCriterion("remarks not between", value1, value2, "remarks"); return (Criteria) this; }