diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java index 250fee57..5c44e4e1 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java @@ -41,50 +41,50 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Insert({ "insert into high_order (title, search_title, ", "product_type, company_id, ", - "company_name, promote_code, ", "mem_discount_id, mem_discount_name, ", "mem_id, mem_name, mem_phone, ", "order_no, pay_serial_no, ", "pay_type, mem_card_id, ", "mem_card_type, mem_card_no, ", - "total_price, total_deduction_price, ", - "deduction_coupon_price, deduction_product_price, ", - "pay_gold, payable_price, ", + "total_price, payable_price, ", "pay_price, pay_real_price, ", "order_status, remarks, ", - "create_time, surplus_refund_price, ", + "create_time, total_deduction_price, ", + "deduction_coupon_price, deduction_product_price, ", + "pay_gold, surplus_refund_price, ", "surplus_refund_integral, pay_time, ", "finish_time, cancel_time, ", "cancel_remarks, refund_time, ", "account_merchant_num, profit_sharing_status, ", "profit_sharing_record_id, whether_check, ", "whether_rebate, exception_status, ", - "exception_content, ext_1, ", - "ext_2, ext_3, ext_4, ", - "ext_5, ext_6)", + "exception_content, company_name, ", + "promote_code, sec_user_id, ", + "ext_1, ext_2, ext_3, ", + "ext_4, ext_5, ext_6)", "values (#{title,jdbcType=VARCHAR}, #{searchTitle,jdbcType=VARCHAR}, ", "#{productType,jdbcType=INTEGER}, #{companyId,jdbcType=BIGINT}, ", - "#{companyName,jdbcType=VARCHAR}, #{promoteCode,jdbcType=VARCHAR}, ", "#{memDiscountId,jdbcType=BIGINT}, #{memDiscountName,jdbcType=VARCHAR}, ", "#{memId,jdbcType=BIGINT}, #{memName,jdbcType=VARCHAR}, #{memPhone,jdbcType=VARCHAR}, ", "#{orderNo,jdbcType=VARCHAR}, #{paySerialNo,jdbcType=VARCHAR}, ", "#{payType,jdbcType=INTEGER}, #{memCardId,jdbcType=BIGINT}, ", "#{memCardType,jdbcType=INTEGER}, #{memCardNo,jdbcType=VARCHAR}, ", - "#{totalPrice,jdbcType=DECIMAL}, #{totalDeductionPrice,jdbcType=DECIMAL}, ", - "#{deductionCouponPrice,jdbcType=DECIMAL}, #{deductionProductPrice,jdbcType=DECIMAL}, ", - "#{payGold,jdbcType=INTEGER}, #{payablePrice,jdbcType=DECIMAL}, ", + "#{totalPrice,jdbcType=DECIMAL}, #{payablePrice,jdbcType=DECIMAL}, ", "#{payPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ", "#{orderStatus,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{surplusRefundPrice,jdbcType=DECIMAL}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{totalDeductionPrice,jdbcType=DECIMAL}, ", + "#{deductionCouponPrice,jdbcType=DECIMAL}, #{deductionProductPrice,jdbcType=DECIMAL}, ", + "#{payGold,jdbcType=INTEGER}, #{surplusRefundPrice,jdbcType=DECIMAL}, ", "#{surplusRefundIntegral,jdbcType=INTEGER}, #{payTime,jdbcType=TIMESTAMP}, ", "#{finishTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ", "#{cancelRemarks,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, ", "#{accountMerchantNum,jdbcType=VARCHAR}, #{profitSharingStatus,jdbcType=BIT}, ", "#{profitSharingRecordId,jdbcType=BIGINT}, #{whetherCheck,jdbcType=BIT}, ", "#{whetherRebate,jdbcType=BIT}, #{exceptionStatus,jdbcType=BIT}, ", - "#{exceptionContent,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, #{ext4,jdbcType=VARCHAR}, ", - "#{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})" + "#{exceptionContent,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, ", + "#{promoteCode,jdbcType=VARCHAR}, #{secUserId,jdbcType=BIGINT}, ", + "#{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(HighOrder record); @@ -100,8 +100,6 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="search_title", property="searchTitle", jdbcType=JdbcType.VARCHAR), @Result(column="product_type", property="productType", jdbcType=JdbcType.INTEGER), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), - @Result(column="company_name", property="companyName", jdbcType=JdbcType.VARCHAR), - @Result(column="promote_code", property="promoteCode", jdbcType=JdbcType.VARCHAR), @Result(column="mem_discount_id", property="memDiscountId", jdbcType=JdbcType.BIGINT), @Result(column="mem_discount_name", property="memDiscountName", jdbcType=JdbcType.VARCHAR), @Result(column="mem_id", property="memId", jdbcType=JdbcType.BIGINT), @@ -114,16 +112,16 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="mem_card_type", property="memCardType", jdbcType=JdbcType.INTEGER), @Result(column="mem_card_no", property="memCardNo", jdbcType=JdbcType.VARCHAR), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="deduction_coupon_price", property="deductionCouponPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="deduction_product_price", property="deductionProductPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="pay_gold", property="payGold", jdbcType=JdbcType.INTEGER), @Result(column="payable_price", property="payablePrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="order_status", property="orderStatus", jdbcType=JdbcType.INTEGER), @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="deduction_coupon_price", property="deductionCouponPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="deduction_product_price", property="deductionProductPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="pay_gold", property="payGold", 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="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @@ -138,6 +136,9 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="whether_rebate", property="whetherRebate", jdbcType=JdbcType.BIT), @Result(column="exception_status", property="exceptionStatus", jdbcType=JdbcType.BIT), @Result(column="exception_content", property="exceptionContent", jdbcType=JdbcType.VARCHAR), + @Result(column="company_name", property="companyName", jdbcType=JdbcType.VARCHAR), + @Result(column="promote_code", property="promoteCode", jdbcType=JdbcType.VARCHAR), + @Result(column="sec_user_id", property="secUserId", jdbcType=JdbcType.BIGINT), @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), @@ -149,14 +150,15 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Select({ "select", - "id, title, search_title, product_type, company_id, company_name, promote_code, ", - "mem_discount_id, mem_discount_name, mem_id, mem_name, mem_phone, order_no, pay_serial_no, ", - "pay_type, mem_card_id, mem_card_type, mem_card_no, total_price, total_deduction_price, ", - "deduction_coupon_price, deduction_product_price, pay_gold, payable_price, pay_price, ", - "pay_real_price, order_status, remarks, create_time, surplus_refund_price, surplus_refund_integral, ", + "id, title, search_title, product_type, company_id, mem_discount_id, mem_discount_name, ", + "mem_id, mem_name, mem_phone, order_no, pay_serial_no, pay_type, mem_card_id, ", + "mem_card_type, mem_card_no, total_price, payable_price, pay_price, pay_real_price, ", + "order_status, remarks, create_time, total_deduction_price, deduction_coupon_price, ", + "deduction_product_price, pay_gold, surplus_refund_price, surplus_refund_integral, ", "pay_time, finish_time, cancel_time, cancel_remarks, refund_time, account_merchant_num, ", "profit_sharing_status, profit_sharing_record_id, whether_check, whether_rebate, ", - "exception_status, exception_content, ext_1, ext_2, ext_3, ext_4, ext_5, ext_6", + "exception_status, exception_content, company_name, promote_code, sec_user_id, ", + "ext_1, ext_2, ext_3, ext_4, ext_5, ext_6", "from high_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -166,8 +168,6 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="search_title", property="searchTitle", jdbcType=JdbcType.VARCHAR), @Result(column="product_type", property="productType", jdbcType=JdbcType.INTEGER), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), - @Result(column="company_name", property="companyName", jdbcType=JdbcType.VARCHAR), - @Result(column="promote_code", property="promoteCode", jdbcType=JdbcType.VARCHAR), @Result(column="mem_discount_id", property="memDiscountId", jdbcType=JdbcType.BIGINT), @Result(column="mem_discount_name", property="memDiscountName", jdbcType=JdbcType.VARCHAR), @Result(column="mem_id", property="memId", jdbcType=JdbcType.BIGINT), @@ -180,16 +180,16 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="mem_card_type", property="memCardType", jdbcType=JdbcType.INTEGER), @Result(column="mem_card_no", property="memCardNo", jdbcType=JdbcType.VARCHAR), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="deduction_coupon_price", property="deductionCouponPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="deduction_product_price", property="deductionProductPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="pay_gold", property="payGold", jdbcType=JdbcType.INTEGER), @Result(column="payable_price", property="payablePrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="order_status", property="orderStatus", jdbcType=JdbcType.INTEGER), @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="deduction_coupon_price", property="deductionCouponPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="deduction_product_price", property="deductionProductPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="pay_gold", property="payGold", 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="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @@ -204,6 +204,9 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="whether_rebate", property="whetherRebate", jdbcType=JdbcType.BIT), @Result(column="exception_status", property="exceptionStatus", jdbcType=JdbcType.BIT), @Result(column="exception_content", property="exceptionContent", jdbcType=JdbcType.VARCHAR), + @Result(column="company_name", property="companyName", jdbcType=JdbcType.VARCHAR), + @Result(column="promote_code", property="promoteCode", jdbcType=JdbcType.VARCHAR), + @Result(column="sec_user_id", property="secUserId", jdbcType=JdbcType.BIGINT), @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), @@ -228,8 +231,6 @@ public interface HighOrderMapper extends HighOrderMapperExt { "search_title = #{searchTitle,jdbcType=VARCHAR},", "product_type = #{productType,jdbcType=INTEGER},", "company_id = #{companyId,jdbcType=BIGINT},", - "company_name = #{companyName,jdbcType=VARCHAR},", - "promote_code = #{promoteCode,jdbcType=VARCHAR},", "mem_discount_id = #{memDiscountId,jdbcType=BIGINT},", "mem_discount_name = #{memDiscountName,jdbcType=VARCHAR},", "mem_id = #{memId,jdbcType=BIGINT},", @@ -242,16 +243,16 @@ public interface HighOrderMapper extends HighOrderMapperExt { "mem_card_type = #{memCardType,jdbcType=INTEGER},", "mem_card_no = #{memCardNo,jdbcType=VARCHAR},", "total_price = #{totalPrice,jdbcType=DECIMAL},", - "total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL},", - "deduction_coupon_price = #{deductionCouponPrice,jdbcType=DECIMAL},", - "deduction_product_price = #{deductionProductPrice,jdbcType=DECIMAL},", - "pay_gold = #{payGold,jdbcType=INTEGER},", "payable_price = #{payablePrice,jdbcType=DECIMAL},", "pay_price = #{payPrice,jdbcType=DECIMAL},", "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},", "order_status = #{orderStatus,jdbcType=INTEGER},", "remarks = #{remarks,jdbcType=VARCHAR},", "create_time = #{createTime,jdbcType=TIMESTAMP},", + "total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL},", + "deduction_coupon_price = #{deductionCouponPrice,jdbcType=DECIMAL},", + "deduction_product_price = #{deductionProductPrice,jdbcType=DECIMAL},", + "pay_gold = #{payGold,jdbcType=INTEGER},", "surplus_refund_price = #{surplusRefundPrice,jdbcType=DECIMAL},", "surplus_refund_integral = #{surplusRefundIntegral,jdbcType=INTEGER},", "pay_time = #{payTime,jdbcType=TIMESTAMP},", @@ -266,6 +267,9 @@ public interface HighOrderMapper extends HighOrderMapperExt { "whether_rebate = #{whetherRebate,jdbcType=BIT},", "exception_status = #{exceptionStatus,jdbcType=BIT},", "exception_content = #{exceptionContent,jdbcType=VARCHAR},", + "company_name = #{companyName,jdbcType=VARCHAR},", + "promote_code = #{promoteCode,jdbcType=VARCHAR},", + "sec_user_id = #{secUserId,jdbcType=BIGINT},", "ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},", "ext_3 = #{ext3,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java index 0d2295b9..113b3dda 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java @@ -44,14 +44,6 @@ public class HighOrderSqlProvider { sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}"); } - if (record.getCompanyName() != null) { - sql.VALUES("company_name", "#{companyName,jdbcType=VARCHAR}"); - } - - if (record.getPromoteCode() != null) { - sql.VALUES("promote_code", "#{promoteCode,jdbcType=VARCHAR}"); - } - if (record.getMemDiscountId() != null) { sql.VALUES("mem_discount_id", "#{memDiscountId,jdbcType=BIGINT}"); } @@ -100,22 +92,6 @@ public class HighOrderSqlProvider { sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}"); } - if (record.getTotalDeductionPrice() != null) { - sql.VALUES("total_deduction_price", "#{totalDeductionPrice,jdbcType=DECIMAL}"); - } - - if (record.getDeductionCouponPrice() != null) { - sql.VALUES("deduction_coupon_price", "#{deductionCouponPrice,jdbcType=DECIMAL}"); - } - - if (record.getDeductionProductPrice() != null) { - sql.VALUES("deduction_product_price", "#{deductionProductPrice,jdbcType=DECIMAL}"); - } - - if (record.getPayGold() != null) { - sql.VALUES("pay_gold", "#{payGold,jdbcType=INTEGER}"); - } - if (record.getPayablePrice() != null) { sql.VALUES("payable_price", "#{payablePrice,jdbcType=DECIMAL}"); } @@ -140,6 +116,22 @@ public class HighOrderSqlProvider { sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); } + if (record.getTotalDeductionPrice() != null) { + sql.VALUES("total_deduction_price", "#{totalDeductionPrice,jdbcType=DECIMAL}"); + } + + if (record.getDeductionCouponPrice() != null) { + sql.VALUES("deduction_coupon_price", "#{deductionCouponPrice,jdbcType=DECIMAL}"); + } + + if (record.getDeductionProductPrice() != null) { + sql.VALUES("deduction_product_price", "#{deductionProductPrice,jdbcType=DECIMAL}"); + } + + if (record.getPayGold() != null) { + sql.VALUES("pay_gold", "#{payGold,jdbcType=INTEGER}"); + } + if (record.getSurplusRefundPrice() != null) { sql.VALUES("surplus_refund_price", "#{surplusRefundPrice,jdbcType=DECIMAL}"); } @@ -196,6 +188,18 @@ public class HighOrderSqlProvider { sql.VALUES("exception_content", "#{exceptionContent,jdbcType=VARCHAR}"); } + if (record.getCompanyName() != null) { + sql.VALUES("company_name", "#{companyName,jdbcType=VARCHAR}"); + } + + if (record.getPromoteCode() != null) { + sql.VALUES("promote_code", "#{promoteCode,jdbcType=VARCHAR}"); + } + + if (record.getSecUserId() != null) { + sql.VALUES("sec_user_id", "#{secUserId,jdbcType=BIGINT}"); + } + if (record.getExt1() != null) { sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); } @@ -234,8 +238,6 @@ public class HighOrderSqlProvider { sql.SELECT("search_title"); sql.SELECT("product_type"); sql.SELECT("company_id"); - sql.SELECT("company_name"); - sql.SELECT("promote_code"); sql.SELECT("mem_discount_id"); sql.SELECT("mem_discount_name"); sql.SELECT("mem_id"); @@ -248,16 +250,16 @@ public class HighOrderSqlProvider { sql.SELECT("mem_card_type"); sql.SELECT("mem_card_no"); sql.SELECT("total_price"); - sql.SELECT("total_deduction_price"); - sql.SELECT("deduction_coupon_price"); - sql.SELECT("deduction_product_price"); - sql.SELECT("pay_gold"); sql.SELECT("payable_price"); sql.SELECT("pay_price"); sql.SELECT("pay_real_price"); sql.SELECT("order_status"); sql.SELECT("remarks"); sql.SELECT("create_time"); + sql.SELECT("total_deduction_price"); + sql.SELECT("deduction_coupon_price"); + sql.SELECT("deduction_product_price"); + sql.SELECT("pay_gold"); sql.SELECT("surplus_refund_price"); sql.SELECT("surplus_refund_integral"); sql.SELECT("pay_time"); @@ -272,6 +274,9 @@ public class HighOrderSqlProvider { sql.SELECT("whether_rebate"); sql.SELECT("exception_status"); sql.SELECT("exception_content"); + sql.SELECT("company_name"); + sql.SELECT("promote_code"); + sql.SELECT("sec_user_id"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); sql.SELECT("ext_3"); @@ -315,14 +320,6 @@ public class HighOrderSqlProvider { sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); } - if (record.getCompanyName() != null) { - sql.SET("company_name = #{record.companyName,jdbcType=VARCHAR}"); - } - - if (record.getPromoteCode() != null) { - sql.SET("promote_code = #{record.promoteCode,jdbcType=VARCHAR}"); - } - if (record.getMemDiscountId() != null) { sql.SET("mem_discount_id = #{record.memDiscountId,jdbcType=BIGINT}"); } @@ -371,22 +368,6 @@ public class HighOrderSqlProvider { sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); } - if (record.getTotalDeductionPrice() != null) { - sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}"); - } - - if (record.getDeductionCouponPrice() != null) { - sql.SET("deduction_coupon_price = #{record.deductionCouponPrice,jdbcType=DECIMAL}"); - } - - if (record.getDeductionProductPrice() != null) { - sql.SET("deduction_product_price = #{record.deductionProductPrice,jdbcType=DECIMAL}"); - } - - if (record.getPayGold() != null) { - sql.SET("pay_gold = #{record.payGold,jdbcType=INTEGER}"); - } - if (record.getPayablePrice() != null) { sql.SET("payable_price = #{record.payablePrice,jdbcType=DECIMAL}"); } @@ -411,6 +392,22 @@ public class HighOrderSqlProvider { sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); } + if (record.getTotalDeductionPrice() != null) { + sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}"); + } + + if (record.getDeductionCouponPrice() != null) { + sql.SET("deduction_coupon_price = #{record.deductionCouponPrice,jdbcType=DECIMAL}"); + } + + if (record.getDeductionProductPrice() != null) { + sql.SET("deduction_product_price = #{record.deductionProductPrice,jdbcType=DECIMAL}"); + } + + if (record.getPayGold() != null) { + sql.SET("pay_gold = #{record.payGold,jdbcType=INTEGER}"); + } + if (record.getSurplusRefundPrice() != null) { sql.SET("surplus_refund_price = #{record.surplusRefundPrice,jdbcType=DECIMAL}"); } @@ -467,6 +464,18 @@ public class HighOrderSqlProvider { sql.SET("exception_content = #{record.exceptionContent,jdbcType=VARCHAR}"); } + if (record.getCompanyName() != null) { + sql.SET("company_name = #{record.companyName,jdbcType=VARCHAR}"); + } + + if (record.getPromoteCode() != null) { + sql.SET("promote_code = #{record.promoteCode,jdbcType=VARCHAR}"); + } + + if (record.getSecUserId() != null) { + sql.SET("sec_user_id = #{record.secUserId,jdbcType=BIGINT}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); } @@ -504,8 +513,6 @@ public class HighOrderSqlProvider { sql.SET("search_title = #{record.searchTitle,jdbcType=VARCHAR}"); sql.SET("product_type = #{record.productType,jdbcType=INTEGER}"); sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); - sql.SET("company_name = #{record.companyName,jdbcType=VARCHAR}"); - sql.SET("promote_code = #{record.promoteCode,jdbcType=VARCHAR}"); sql.SET("mem_discount_id = #{record.memDiscountId,jdbcType=BIGINT}"); sql.SET("mem_discount_name = #{record.memDiscountName,jdbcType=VARCHAR}"); sql.SET("mem_id = #{record.memId,jdbcType=BIGINT}"); @@ -518,16 +525,16 @@ public class HighOrderSqlProvider { sql.SET("mem_card_type = #{record.memCardType,jdbcType=INTEGER}"); sql.SET("mem_card_no = #{record.memCardNo,jdbcType=VARCHAR}"); sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); - sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}"); - sql.SET("deduction_coupon_price = #{record.deductionCouponPrice,jdbcType=DECIMAL}"); - sql.SET("deduction_product_price = #{record.deductionProductPrice,jdbcType=DECIMAL}"); - sql.SET("pay_gold = #{record.payGold,jdbcType=INTEGER}"); sql.SET("payable_price = #{record.payablePrice,jdbcType=DECIMAL}"); sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}"); sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); sql.SET("order_status = #{record.orderStatus,jdbcType=INTEGER}"); sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}"); + sql.SET("deduction_coupon_price = #{record.deductionCouponPrice,jdbcType=DECIMAL}"); + sql.SET("deduction_product_price = #{record.deductionProductPrice,jdbcType=DECIMAL}"); + sql.SET("pay_gold = #{record.payGold,jdbcType=INTEGER}"); sql.SET("surplus_refund_price = #{record.surplusRefundPrice,jdbcType=DECIMAL}"); sql.SET("surplus_refund_integral = #{record.surplusRefundIntegral,jdbcType=INTEGER}"); sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); @@ -542,6 +549,9 @@ public class HighOrderSqlProvider { sql.SET("whether_rebate = #{record.whetherRebate,jdbcType=BIT}"); sql.SET("exception_status = #{record.exceptionStatus,jdbcType=BIT}"); sql.SET("exception_content = #{record.exceptionContent,jdbcType=VARCHAR}"); + sql.SET("company_name = #{record.companyName,jdbcType=VARCHAR}"); + sql.SET("promote_code = #{record.promoteCode,jdbcType=VARCHAR}"); + sql.SET("sec_user_id = #{record.secUserId,jdbcType=BIGINT}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); @@ -574,14 +584,6 @@ public class HighOrderSqlProvider { sql.SET("company_id = #{companyId,jdbcType=BIGINT}"); } - if (record.getCompanyName() != null) { - sql.SET("company_name = #{companyName,jdbcType=VARCHAR}"); - } - - if (record.getPromoteCode() != null) { - sql.SET("promote_code = #{promoteCode,jdbcType=VARCHAR}"); - } - if (record.getMemDiscountId() != null) { sql.SET("mem_discount_id = #{memDiscountId,jdbcType=BIGINT}"); } @@ -630,22 +632,6 @@ public class HighOrderSqlProvider { sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}"); } - if (record.getTotalDeductionPrice() != null) { - sql.SET("total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL}"); - } - - if (record.getDeductionCouponPrice() != null) { - sql.SET("deduction_coupon_price = #{deductionCouponPrice,jdbcType=DECIMAL}"); - } - - if (record.getDeductionProductPrice() != null) { - sql.SET("deduction_product_price = #{deductionProductPrice,jdbcType=DECIMAL}"); - } - - if (record.getPayGold() != null) { - sql.SET("pay_gold = #{payGold,jdbcType=INTEGER}"); - } - if (record.getPayablePrice() != null) { sql.SET("payable_price = #{payablePrice,jdbcType=DECIMAL}"); } @@ -670,6 +656,22 @@ public class HighOrderSqlProvider { sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); } + if (record.getTotalDeductionPrice() != null) { + sql.SET("total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL}"); + } + + if (record.getDeductionCouponPrice() != null) { + sql.SET("deduction_coupon_price = #{deductionCouponPrice,jdbcType=DECIMAL}"); + } + + if (record.getDeductionProductPrice() != null) { + sql.SET("deduction_product_price = #{deductionProductPrice,jdbcType=DECIMAL}"); + } + + if (record.getPayGold() != null) { + sql.SET("pay_gold = #{payGold,jdbcType=INTEGER}"); + } + if (record.getSurplusRefundPrice() != null) { sql.SET("surplus_refund_price = #{surplusRefundPrice,jdbcType=DECIMAL}"); } @@ -726,6 +728,18 @@ public class HighOrderSqlProvider { sql.SET("exception_content = #{exceptionContent,jdbcType=VARCHAR}"); } + if (record.getCompanyName() != null) { + sql.SET("company_name = #{companyName,jdbcType=VARCHAR}"); + } + + if (record.getPromoteCode() != null) { + sql.SET("promote_code = #{promoteCode,jdbcType=VARCHAR}"); + } + + if (record.getSecUserId() != null) { + sql.SET("sec_user_id = #{secUserId,jdbcType=BIGINT}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); } diff --git a/hai-service/src/main/java/com/hai/entity/HighOrder.java b/hai-service/src/main/java/com/hai/entity/HighOrder.java index 426ddafb..56bf0f76 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrder.java @@ -3,7 +3,6 @@ package com.hai.entity; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import java.util.List; /** * high_order @@ -41,6 +40,9 @@ public class HighOrder implements Serializable { 7：优惠券包 8：汇联通充值 9：话费充值 +10:电影票 +11:贵州中石化 +12:实物商品 */ private Integer productType; @@ -49,16 +51,6 @@ public class HighOrder implements Serializable { */ private Long companyId; - /** - * 公司名称 - */ - private String companyName; - - /** - * 推广码 - */ - private String promoteCode; - /** * 用户的优惠券high_discount_user_rel表的id */ @@ -119,26 +111,6 @@ public class HighOrder implements Serializable { */ private BigDecimal totalPrice; - /** - * 交易总优惠金额（优惠券优惠金额+商品优惠金额） - */ - private BigDecimal totalDeductionPrice; - - /** - * 优惠券优惠金额 - */ - private BigDecimal deductionCouponPrice; - - /** - * 产品优惠金额 - */ - private BigDecimal deductionProductPrice; - - /** - * 积分抵扣 - */ - private Integer payGold; - /** * 应付金额 */ @@ -169,6 +141,26 @@ public class HighOrder implements Serializable { */ private Date createTime; + /** + * 交易总优惠金额（优惠券优惠金额+商品优惠金额） + */ + private BigDecimal totalDeductionPrice; + + /** + * 优惠券优惠金额 + */ + private BigDecimal deductionCouponPrice; + + /** + * 产品优惠金额 + */ + private BigDecimal deductionProductPrice; + + /** + * 积分抵扣 + */ + private Integer payGold; + /** * 可退款金额 */ @@ -239,6 +231,21 @@ public class HighOrder implements Serializable { */ private String exceptionContent; + /** + * 公司名称 + */ + private String companyName; + + /** + * 推广码 + */ + private String promoteCode; + + /** + * 后台用户ID + */ + private Long secUserId; + private String ext1; private String ext2; @@ -249,40 +256,13 @@ public class HighOrder implements Serializable { private String ext5; + /** + * 存实物 商品图片 + */ private String ext6; - private String time; - - private String goodsTypeName; - - public String getGoodsTypeName() { - return goodsTypeName; - } - - public void setGoodsTypeName(String goodsTypeName) { - this.goodsTypeName = goodsTypeName; - } - - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - private static final long serialVersionUID = 1L; - private List highChildOrderList; - - public List getHighChildOrderList() { - return highChildOrderList; - } - - public void setHighChildOrderList(List highChildOrderList) { - this.highChildOrderList = highChildOrderList; - } - public Long getId() { return id; } @@ -323,22 +303,6 @@ public class HighOrder implements Serializable { this.companyId = companyId; } - public String getCompanyName() { - return companyName; - } - - public void setCompanyName(String companyName) { - this.companyName = companyName; - } - - public String getPromoteCode() { - return promoteCode; - } - - public void setPromoteCode(String promoteCode) { - this.promoteCode = promoteCode; - } - public Long getMemDiscountId() { return memDiscountId; } @@ -435,38 +399,6 @@ public class HighOrder implements Serializable { this.totalPrice = totalPrice; } - public BigDecimal getTotalDeductionPrice() { - return totalDeductionPrice; - } - - public void setTotalDeductionPrice(BigDecimal totalDeductionPrice) { - this.totalDeductionPrice = totalDeductionPrice; - } - - public BigDecimal getDeductionCouponPrice() { - return deductionCouponPrice; - } - - public void setDeductionCouponPrice(BigDecimal deductionCouponPrice) { - this.deductionCouponPrice = deductionCouponPrice; - } - - public BigDecimal getDeductionProductPrice() { - return deductionProductPrice; - } - - public void setDeductionProductPrice(BigDecimal deductionProductPrice) { - this.deductionProductPrice = deductionProductPrice; - } - - public Integer getPayGold() { - return payGold; - } - - public void setPayGold(Integer payGold) { - this.payGold = payGold; - } - public BigDecimal getPayablePrice() { return payablePrice; } @@ -515,6 +447,38 @@ public class HighOrder implements Serializable { this.createTime = createTime; } + public BigDecimal getTotalDeductionPrice() { + return totalDeductionPrice; + } + + public void setTotalDeductionPrice(BigDecimal totalDeductionPrice) { + this.totalDeductionPrice = totalDeductionPrice; + } + + public BigDecimal getDeductionCouponPrice() { + return deductionCouponPrice; + } + + public void setDeductionCouponPrice(BigDecimal deductionCouponPrice) { + this.deductionCouponPrice = deductionCouponPrice; + } + + public BigDecimal getDeductionProductPrice() { + return deductionProductPrice; + } + + public void setDeductionProductPrice(BigDecimal deductionProductPrice) { + this.deductionProductPrice = deductionProductPrice; + } + + public Integer getPayGold() { + return payGold; + } + + public void setPayGold(Integer payGold) { + this.payGold = payGold; + } + public BigDecimal getSurplusRefundPrice() { return surplusRefundPrice; } @@ -627,6 +591,30 @@ public class HighOrder implements Serializable { this.exceptionContent = exceptionContent; } + public String getCompanyName() { + return companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + public String getPromoteCode() { + return promoteCode; + } + + public void setPromoteCode(String promoteCode) { + this.promoteCode = promoteCode; + } + + public Long getSecUserId() { + return secUserId; + } + + public void setSecUserId(Long secUserId) { + this.secUserId = secUserId; + } + public String getExt1() { return ext1; } @@ -692,8 +680,6 @@ public class HighOrder implements Serializable { && (this.getSearchTitle() == null ? other.getSearchTitle() == null : this.getSearchTitle().equals(other.getSearchTitle())) && (this.getProductType() == null ? other.getProductType() == null : this.getProductType().equals(other.getProductType())) && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) - && (this.getCompanyName() == null ? other.getCompanyName() == null : this.getCompanyName().equals(other.getCompanyName())) - && (this.getPromoteCode() == null ? other.getPromoteCode() == null : this.getPromoteCode().equals(other.getPromoteCode())) && (this.getMemDiscountId() == null ? other.getMemDiscountId() == null : this.getMemDiscountId().equals(other.getMemDiscountId())) && (this.getMemDiscountName() == null ? other.getMemDiscountName() == null : this.getMemDiscountName().equals(other.getMemDiscountName())) && (this.getMemId() == null ? other.getMemId() == null : this.getMemId().equals(other.getMemId())) @@ -706,16 +692,16 @@ public class HighOrder implements Serializable { && (this.getMemCardType() == null ? other.getMemCardType() == null : this.getMemCardType().equals(other.getMemCardType())) && (this.getMemCardNo() == null ? other.getMemCardNo() == null : this.getMemCardNo().equals(other.getMemCardNo())) && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice())) - && (this.getTotalDeductionPrice() == null ? other.getTotalDeductionPrice() == null : this.getTotalDeductionPrice().equals(other.getTotalDeductionPrice())) - && (this.getDeductionCouponPrice() == null ? other.getDeductionCouponPrice() == null : this.getDeductionCouponPrice().equals(other.getDeductionCouponPrice())) - && (this.getDeductionProductPrice() == null ? other.getDeductionProductPrice() == null : this.getDeductionProductPrice().equals(other.getDeductionProductPrice())) - && (this.getPayGold() == null ? other.getPayGold() == null : this.getPayGold().equals(other.getPayGold())) && (this.getPayablePrice() == null ? other.getPayablePrice() == null : this.getPayablePrice().equals(other.getPayablePrice())) && (this.getPayPrice() == null ? other.getPayPrice() == null : this.getPayPrice().equals(other.getPayPrice())) && (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice())) && (this.getOrderStatus() == null ? other.getOrderStatus() == null : this.getOrderStatus().equals(other.getOrderStatus())) && (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getTotalDeductionPrice() == null ? other.getTotalDeductionPrice() == null : this.getTotalDeductionPrice().equals(other.getTotalDeductionPrice())) + && (this.getDeductionCouponPrice() == null ? other.getDeductionCouponPrice() == null : this.getDeductionCouponPrice().equals(other.getDeductionCouponPrice())) + && (this.getDeductionProductPrice() == null ? other.getDeductionProductPrice() == null : this.getDeductionProductPrice().equals(other.getDeductionProductPrice())) + && (this.getPayGold() == null ? other.getPayGold() == null : this.getPayGold().equals(other.getPayGold())) && (this.getSurplusRefundPrice() == null ? other.getSurplusRefundPrice() == null : this.getSurplusRefundPrice().equals(other.getSurplusRefundPrice())) && (this.getSurplusRefundIntegral() == null ? other.getSurplusRefundIntegral() == null : this.getSurplusRefundIntegral().equals(other.getSurplusRefundIntegral())) && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) @@ -730,6 +716,9 @@ public class HighOrder implements Serializable { && (this.getWhetherRebate() == null ? other.getWhetherRebate() == null : this.getWhetherRebate().equals(other.getWhetherRebate())) && (this.getExceptionStatus() == null ? other.getExceptionStatus() == null : this.getExceptionStatus().equals(other.getExceptionStatus())) && (this.getExceptionContent() == null ? other.getExceptionContent() == null : this.getExceptionContent().equals(other.getExceptionContent())) + && (this.getCompanyName() == null ? other.getCompanyName() == null : this.getCompanyName().equals(other.getCompanyName())) + && (this.getPromoteCode() == null ? other.getPromoteCode() == null : this.getPromoteCode().equals(other.getPromoteCode())) + && (this.getSecUserId() == null ? other.getSecUserId() == null : this.getSecUserId().equals(other.getSecUserId())) && (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())) @@ -747,8 +736,6 @@ public class HighOrder implements Serializable { result = prime * result + ((getSearchTitle() == null) ? 0 : getSearchTitle().hashCode()); result = prime * result + ((getProductType() == null) ? 0 : getProductType().hashCode()); result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); - result = prime * result + ((getCompanyName() == null) ? 0 : getCompanyName().hashCode()); - result = prime * result + ((getPromoteCode() == null) ? 0 : getPromoteCode().hashCode()); result = prime * result + ((getMemDiscountId() == null) ? 0 : getMemDiscountId().hashCode()); result = prime * result + ((getMemDiscountName() == null) ? 0 : getMemDiscountName().hashCode()); result = prime * result + ((getMemId() == null) ? 0 : getMemId().hashCode()); @@ -761,16 +748,16 @@ public class HighOrder implements Serializable { result = prime * result + ((getMemCardType() == null) ? 0 : getMemCardType().hashCode()); result = prime * result + ((getMemCardNo() == null) ? 0 : getMemCardNo().hashCode()); result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode()); - result = prime * result + ((getTotalDeductionPrice() == null) ? 0 : getTotalDeductionPrice().hashCode()); - result = prime * result + ((getDeductionCouponPrice() == null) ? 0 : getDeductionCouponPrice().hashCode()); - result = prime * result + ((getDeductionProductPrice() == null) ? 0 : getDeductionProductPrice().hashCode()); - result = prime * result + ((getPayGold() == null) ? 0 : getPayGold().hashCode()); result = prime * result + ((getPayablePrice() == null) ? 0 : getPayablePrice().hashCode()); result = prime * result + ((getPayPrice() == null) ? 0 : getPayPrice().hashCode()); result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode()); result = prime * result + ((getOrderStatus() == null) ? 0 : getOrderStatus().hashCode()); result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getTotalDeductionPrice() == null) ? 0 : getTotalDeductionPrice().hashCode()); + result = prime * result + ((getDeductionCouponPrice() == null) ? 0 : getDeductionCouponPrice().hashCode()); + result = prime * result + ((getDeductionProductPrice() == null) ? 0 : getDeductionProductPrice().hashCode()); + result = prime * result + ((getPayGold() == null) ? 0 : getPayGold().hashCode()); result = prime * result + ((getSurplusRefundPrice() == null) ? 0 : getSurplusRefundPrice().hashCode()); result = prime * result + ((getSurplusRefundIntegral() == null) ? 0 : getSurplusRefundIntegral().hashCode()); result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); @@ -785,6 +772,9 @@ public class HighOrder implements Serializable { result = prime * result + ((getWhetherRebate() == null) ? 0 : getWhetherRebate().hashCode()); result = prime * result + ((getExceptionStatus() == null) ? 0 : getExceptionStatus().hashCode()); result = prime * result + ((getExceptionContent() == null) ? 0 : getExceptionContent().hashCode()); + result = prime * result + ((getCompanyName() == null) ? 0 : getCompanyName().hashCode()); + result = prime * result + ((getPromoteCode() == null) ? 0 : getPromoteCode().hashCode()); + result = prime * result + ((getSecUserId() == null) ? 0 : getSecUserId().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()); @@ -805,8 +795,6 @@ public class HighOrder implements Serializable { sb.append(", searchTitle=").append(searchTitle); sb.append(", productType=").append(productType); sb.append(", companyId=").append(companyId); - sb.append(", companyName=").append(companyName); - sb.append(", promoteCode=").append(promoteCode); sb.append(", memDiscountId=").append(memDiscountId); sb.append(", memDiscountName=").append(memDiscountName); sb.append(", memId=").append(memId); @@ -819,16 +807,16 @@ public class HighOrder implements Serializable { sb.append(", memCardType=").append(memCardType); sb.append(", memCardNo=").append(memCardNo); sb.append(", totalPrice=").append(totalPrice); - sb.append(", totalDeductionPrice=").append(totalDeductionPrice); - sb.append(", deductionCouponPrice=").append(deductionCouponPrice); - sb.append(", deductionProductPrice=").append(deductionProductPrice); - sb.append(", payGold=").append(payGold); sb.append(", payablePrice=").append(payablePrice); sb.append(", payPrice=").append(payPrice); sb.append(", payRealPrice=").append(payRealPrice); sb.append(", orderStatus=").append(orderStatus); sb.append(", remarks=").append(remarks); sb.append(", createTime=").append(createTime); + sb.append(", totalDeductionPrice=").append(totalDeductionPrice); + sb.append(", deductionCouponPrice=").append(deductionCouponPrice); + sb.append(", deductionProductPrice=").append(deductionProductPrice); + sb.append(", payGold=").append(payGold); sb.append(", surplusRefundPrice=").append(surplusRefundPrice); sb.append(", surplusRefundIntegral=").append(surplusRefundIntegral); sb.append(", payTime=").append(payTime); @@ -843,6 +831,9 @@ public class HighOrder implements Serializable { sb.append(", whetherRebate=").append(whetherRebate); sb.append(", exceptionStatus=").append(exceptionStatus); sb.append(", exceptionContent=").append(exceptionContent); + sb.append(", companyName=").append(companyName); + sb.append(", promoteCode=").append(promoteCode); + sb.append(", secUserId=").append(secUserId); sb.append(", ext1=").append(ext1); sb.append(", ext2=").append(ext2); sb.append(", ext3=").append(ext3); @@ -853,4 +844,4 @@ public class HighOrder implements Serializable { sb.append("]"); return sb.toString(); } -} +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java index 858b0283..1bb72bd9 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java @@ -446,146 +446,6 @@ public class HighOrderExample { return (Criteria) this; } - public Criteria andCompanyNameIsNull() { - addCriterion("company_name is null"); - return (Criteria) this; - } - - public Criteria andCompanyNameIsNotNull() { - addCriterion("company_name is not null"); - return (Criteria) this; - } - - public Criteria andCompanyNameEqualTo(String value) { - addCriterion("company_name =", value, "companyName"); - return (Criteria) this; - } - - public Criteria andCompanyNameNotEqualTo(String value) { - addCriterion("company_name <>", value, "companyName"); - return (Criteria) this; - } - - public Criteria andCompanyNameGreaterThan(String value) { - addCriterion("company_name >", value, "companyName"); - return (Criteria) this; - } - - public Criteria andCompanyNameGreaterThanOrEqualTo(String value) { - addCriterion("company_name >=", value, "companyName"); - return (Criteria) this; - } - - public Criteria andCompanyNameLessThan(String value) { - addCriterion("company_name <", value, "companyName"); - return (Criteria) this; - } - - public Criteria andCompanyNameLessThanOrEqualTo(String value) { - addCriterion("company_name <=", value, "companyName"); - return (Criteria) this; - } - - public Criteria andCompanyNameLike(String value) { - addCriterion("company_name like", value, "companyName"); - return (Criteria) this; - } - - public Criteria andCompanyNameNotLike(String value) { - addCriterion("company_name not like", value, "companyName"); - return (Criteria) this; - } - - public Criteria andCompanyNameIn(List values) { - addCriterion("company_name in", values, "companyName"); - return (Criteria) this; - } - - public Criteria andCompanyNameNotIn(List values) { - addCriterion("company_name not in", values, "companyName"); - return (Criteria) this; - } - - public Criteria andCompanyNameBetween(String value1, String value2) { - addCriterion("company_name between", value1, value2, "companyName"); - return (Criteria) this; - } - - public Criteria andCompanyNameNotBetween(String value1, String value2) { - addCriterion("company_name not between", value1, value2, "companyName"); - return (Criteria) this; - } - - public Criteria andPromoteCodeIsNull() { - addCriterion("promote_code is null"); - return (Criteria) this; - } - - public Criteria andPromoteCodeIsNotNull() { - addCriterion("promote_code is not null"); - return (Criteria) this; - } - - public Criteria andPromoteCodeEqualTo(String value) { - addCriterion("promote_code =", value, "promoteCode"); - return (Criteria) this; - } - - public Criteria andPromoteCodeNotEqualTo(String value) { - addCriterion("promote_code <>", value, "promoteCode"); - return (Criteria) this; - } - - public Criteria andPromoteCodeGreaterThan(String value) { - addCriterion("promote_code >", value, "promoteCode"); - return (Criteria) this; - } - - public Criteria andPromoteCodeGreaterThanOrEqualTo(String value) { - addCriterion("promote_code >=", value, "promoteCode"); - return (Criteria) this; - } - - public Criteria andPromoteCodeLessThan(String value) { - addCriterion("promote_code <", value, "promoteCode"); - return (Criteria) this; - } - - public Criteria andPromoteCodeLessThanOrEqualTo(String value) { - addCriterion("promote_code <=", value, "promoteCode"); - return (Criteria) this; - } - - public Criteria andPromoteCodeLike(String value) { - addCriterion("promote_code like", value, "promoteCode"); - return (Criteria) this; - } - - public Criteria andPromoteCodeNotLike(String value) { - addCriterion("promote_code not like", value, "promoteCode"); - return (Criteria) this; - } - - public Criteria andPromoteCodeIn(List values) { - addCriterion("promote_code in", values, "promoteCode"); - return (Criteria) this; - } - - public Criteria andPromoteCodeNotIn(List values) { - addCriterion("promote_code not in", values, "promoteCode"); - return (Criteria) this; - } - - public Criteria andPromoteCodeBetween(String value1, String value2) { - addCriterion("promote_code between", value1, value2, "promoteCode"); - return (Criteria) this; - } - - public Criteria andPromoteCodeNotBetween(String value1, String value2) { - addCriterion("promote_code not between", value1, value2, "promoteCode"); - return (Criteria) this; - } - public Criteria andMemDiscountIdIsNull() { addCriterion("mem_discount_id is null"); return (Criteria) this; @@ -1366,613 +1226,613 @@ public class HighOrderExample { return (Criteria) this; } - public Criteria andTotalDeductionPriceIsNull() { - addCriterion("total_deduction_price is null"); + public Criteria andPayablePriceIsNull() { + addCriterion("payable_price is null"); return (Criteria) this; } - public Criteria andTotalDeductionPriceIsNotNull() { - addCriterion("total_deduction_price is not null"); + public Criteria andPayablePriceIsNotNull() { + addCriterion("payable_price is not null"); return (Criteria) this; } - public Criteria andTotalDeductionPriceEqualTo(BigDecimal value) { - addCriterion("total_deduction_price =", value, "totalDeductionPrice"); + public Criteria andPayablePriceEqualTo(BigDecimal value) { + addCriterion("payable_price =", value, "payablePrice"); return (Criteria) this; } - public Criteria andTotalDeductionPriceNotEqualTo(BigDecimal value) { - addCriterion("total_deduction_price <>", value, "totalDeductionPrice"); + public Criteria andPayablePriceNotEqualTo(BigDecimal value) { + addCriterion("payable_price <>", value, "payablePrice"); return (Criteria) this; } - public Criteria andTotalDeductionPriceGreaterThan(BigDecimal value) { - addCriterion("total_deduction_price >", value, "totalDeductionPrice"); + public Criteria andPayablePriceGreaterThan(BigDecimal value) { + addCriterion("payable_price >", value, "payablePrice"); return (Criteria) this; } - public Criteria andTotalDeductionPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("total_deduction_price >=", value, "totalDeductionPrice"); + public Criteria andPayablePriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("payable_price >=", value, "payablePrice"); return (Criteria) this; } - public Criteria andTotalDeductionPriceLessThan(BigDecimal value) { - addCriterion("total_deduction_price <", value, "totalDeductionPrice"); + public Criteria andPayablePriceLessThan(BigDecimal value) { + addCriterion("payable_price <", value, "payablePrice"); return (Criteria) this; } - public Criteria andTotalDeductionPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("total_deduction_price <=", value, "totalDeductionPrice"); + public Criteria andPayablePriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("payable_price <=", value, "payablePrice"); return (Criteria) this; } - public Criteria andTotalDeductionPriceIn(List values) { - addCriterion("total_deduction_price in", values, "totalDeductionPrice"); + public Criteria andPayablePriceIn(List values) { + addCriterion("payable_price in", values, "payablePrice"); return (Criteria) this; } - public Criteria andTotalDeductionPriceNotIn(List values) { - addCriterion("total_deduction_price not in", values, "totalDeductionPrice"); + public Criteria andPayablePriceNotIn(List values) { + addCriterion("payable_price not in", values, "payablePrice"); return (Criteria) this; } - public Criteria andTotalDeductionPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("total_deduction_price between", value1, value2, "totalDeductionPrice"); + public Criteria andPayablePriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("payable_price between", value1, value2, "payablePrice"); return (Criteria) this; } - public Criteria andTotalDeductionPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("total_deduction_price not between", value1, value2, "totalDeductionPrice"); + public Criteria andPayablePriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("payable_price not between", value1, value2, "payablePrice"); return (Criteria) this; } - public Criteria andDeductionCouponPriceIsNull() { - addCriterion("deduction_coupon_price is null"); + public Criteria andPayPriceIsNull() { + addCriterion("pay_price is null"); return (Criteria) this; } - public Criteria andDeductionCouponPriceIsNotNull() { - addCriterion("deduction_coupon_price is not null"); + public Criteria andPayPriceIsNotNull() { + addCriterion("pay_price is not null"); return (Criteria) this; } - public Criteria andDeductionCouponPriceEqualTo(BigDecimal value) { - addCriterion("deduction_coupon_price =", value, "deductionCouponPrice"); + public Criteria andPayPriceEqualTo(BigDecimal value) { + addCriterion("pay_price =", value, "payPrice"); return (Criteria) this; } - public Criteria andDeductionCouponPriceNotEqualTo(BigDecimal value) { - addCriterion("deduction_coupon_price <>", value, "deductionCouponPrice"); + public Criteria andPayPriceNotEqualTo(BigDecimal value) { + addCriterion("pay_price <>", value, "payPrice"); return (Criteria) this; } - public Criteria andDeductionCouponPriceGreaterThan(BigDecimal value) { - addCriterion("deduction_coupon_price >", value, "deductionCouponPrice"); + public Criteria andPayPriceGreaterThan(BigDecimal value) { + addCriterion("pay_price >", value, "payPrice"); return (Criteria) this; } - public Criteria andDeductionCouponPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("deduction_coupon_price >=", value, "deductionCouponPrice"); + public Criteria andPayPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("pay_price >=", value, "payPrice"); return (Criteria) this; } - public Criteria andDeductionCouponPriceLessThan(BigDecimal value) { - addCriterion("deduction_coupon_price <", value, "deductionCouponPrice"); + public Criteria andPayPriceLessThan(BigDecimal value) { + addCriterion("pay_price <", value, "payPrice"); return (Criteria) this; } - public Criteria andDeductionCouponPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("deduction_coupon_price <=", value, "deductionCouponPrice"); + public Criteria andPayPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("pay_price <=", value, "payPrice"); return (Criteria) this; } - public Criteria andDeductionCouponPriceIn(List values) { - addCriterion("deduction_coupon_price in", values, "deductionCouponPrice"); + public Criteria andPayPriceIn(List values) { + addCriterion("pay_price in", values, "payPrice"); return (Criteria) this; } - public Criteria andDeductionCouponPriceNotIn(List values) { - addCriterion("deduction_coupon_price not in", values, "deductionCouponPrice"); + public Criteria andPayPriceNotIn(List values) { + addCriterion("pay_price not in", values, "payPrice"); return (Criteria) this; } - public Criteria andDeductionCouponPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("deduction_coupon_price between", value1, value2, "deductionCouponPrice"); + public Criteria andPayPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_price between", value1, value2, "payPrice"); return (Criteria) this; } - public Criteria andDeductionCouponPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("deduction_coupon_price not between", value1, value2, "deductionCouponPrice"); + public Criteria andPayPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_price not between", value1, value2, "payPrice"); return (Criteria) this; } - public Criteria andDeductionProductPriceIsNull() { - addCriterion("deduction_product_price is null"); + public Criteria andPayRealPriceIsNull() { + addCriterion("pay_real_price is null"); return (Criteria) this; } - public Criteria andDeductionProductPriceIsNotNull() { - addCriterion("deduction_product_price is not null"); + public Criteria andPayRealPriceIsNotNull() { + addCriterion("pay_real_price is not null"); return (Criteria) this; } - public Criteria andDeductionProductPriceEqualTo(BigDecimal value) { - addCriterion("deduction_product_price =", value, "deductionProductPrice"); + public Criteria andPayRealPriceEqualTo(BigDecimal value) { + addCriterion("pay_real_price =", value, "payRealPrice"); return (Criteria) this; } - public Criteria andDeductionProductPriceNotEqualTo(BigDecimal value) { - addCriterion("deduction_product_price <>", value, "deductionProductPrice"); + public Criteria andPayRealPriceNotEqualTo(BigDecimal value) { + addCriterion("pay_real_price <>", value, "payRealPrice"); return (Criteria) this; } - public Criteria andDeductionProductPriceGreaterThan(BigDecimal value) { - addCriterion("deduction_product_price >", value, "deductionProductPrice"); + public Criteria andPayRealPriceGreaterThan(BigDecimal value) { + addCriterion("pay_real_price >", value, "payRealPrice"); return (Criteria) this; } - public Criteria andDeductionProductPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("deduction_product_price >=", value, "deductionProductPrice"); + public Criteria andPayRealPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("pay_real_price >=", value, "payRealPrice"); return (Criteria) this; } - public Criteria andDeductionProductPriceLessThan(BigDecimal value) { - addCriterion("deduction_product_price <", value, "deductionProductPrice"); + public Criteria andPayRealPriceLessThan(BigDecimal value) { + addCriterion("pay_real_price <", value, "payRealPrice"); return (Criteria) this; } - public Criteria andDeductionProductPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("deduction_product_price <=", value, "deductionProductPrice"); + public Criteria andPayRealPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("pay_real_price <=", value, "payRealPrice"); return (Criteria) this; } - public Criteria andDeductionProductPriceIn(List values) { - addCriterion("deduction_product_price in", values, "deductionProductPrice"); + public Criteria andPayRealPriceIn(List values) { + addCriterion("pay_real_price in", values, "payRealPrice"); return (Criteria) this; } - public Criteria andDeductionProductPriceNotIn(List values) { - addCriterion("deduction_product_price not in", values, "deductionProductPrice"); + public Criteria andPayRealPriceNotIn(List values) { + addCriterion("pay_real_price not in", values, "payRealPrice"); return (Criteria) this; } - public Criteria andDeductionProductPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("deduction_product_price between", value1, value2, "deductionProductPrice"); + public Criteria andPayRealPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_real_price between", value1, value2, "payRealPrice"); return (Criteria) this; } - public Criteria andDeductionProductPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("deduction_product_price not between", value1, value2, "deductionProductPrice"); + public Criteria andPayRealPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_real_price not between", value1, value2, "payRealPrice"); return (Criteria) this; } - public Criteria andPayGoldIsNull() { - addCriterion("pay_gold is null"); + public Criteria andOrderStatusIsNull() { + addCriterion("order_status is null"); return (Criteria) this; } - public Criteria andPayGoldIsNotNull() { - addCriterion("pay_gold is not null"); + public Criteria andOrderStatusIsNotNull() { + addCriterion("order_status is not null"); return (Criteria) this; } - public Criteria andPayGoldEqualTo(Integer value) { - addCriterion("pay_gold =", value, "payGold"); + public Criteria andOrderStatusEqualTo(Integer value) { + addCriterion("order_status =", value, "orderStatus"); return (Criteria) this; } - public Criteria andPayGoldNotEqualTo(Integer value) { - addCriterion("pay_gold <>", value, "payGold"); + public Criteria andOrderStatusNotEqualTo(Integer value) { + addCriterion("order_status <>", value, "orderStatus"); return (Criteria) this; } - public Criteria andPayGoldGreaterThan(Integer value) { - addCriterion("pay_gold >", value, "payGold"); + public Criteria andOrderStatusGreaterThan(Integer value) { + addCriterion("order_status >", value, "orderStatus"); return (Criteria) this; } - public Criteria andPayGoldGreaterThanOrEqualTo(Integer value) { - addCriterion("pay_gold >=", value, "payGold"); + public Criteria andOrderStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("order_status >=", value, "orderStatus"); return (Criteria) this; } - public Criteria andPayGoldLessThan(Integer value) { - addCriterion("pay_gold <", value, "payGold"); + public Criteria andOrderStatusLessThan(Integer value) { + addCriterion("order_status <", value, "orderStatus"); return (Criteria) this; } - public Criteria andPayGoldLessThanOrEqualTo(Integer value) { - addCriterion("pay_gold <=", value, "payGold"); + public Criteria andOrderStatusLessThanOrEqualTo(Integer value) { + addCriterion("order_status <=", value, "orderStatus"); return (Criteria) this; } - public Criteria andPayGoldIn(List values) { - addCriterion("pay_gold in", values, "payGold"); + public Criteria andOrderStatusIn(List values) { + addCriterion("order_status in", values, "orderStatus"); return (Criteria) this; } - public Criteria andPayGoldNotIn(List values) { - addCriterion("pay_gold not in", values, "payGold"); + public Criteria andOrderStatusNotIn(List values) { + addCriterion("order_status not in", values, "orderStatus"); return (Criteria) this; } - public Criteria andPayGoldBetween(Integer value1, Integer value2) { - addCriterion("pay_gold between", value1, value2, "payGold"); + public Criteria andOrderStatusBetween(Integer value1, Integer value2) { + addCriterion("order_status between", value1, value2, "orderStatus"); return (Criteria) this; } - public Criteria andPayGoldNotBetween(Integer value1, Integer value2) { - addCriterion("pay_gold not between", value1, value2, "payGold"); + public Criteria andOrderStatusNotBetween(Integer value1, Integer value2) { + addCriterion("order_status not between", value1, value2, "orderStatus"); return (Criteria) this; } - public Criteria andPayablePriceIsNull() { - addCriterion("payable_price is null"); + public Criteria andRemarksIsNull() { + addCriterion("remarks is null"); return (Criteria) this; } - public Criteria andPayablePriceIsNotNull() { - addCriterion("payable_price is not null"); + public Criteria andRemarksIsNotNull() { + addCriterion("remarks is not null"); return (Criteria) this; } - public Criteria andPayablePriceEqualTo(BigDecimal value) { - addCriterion("payable_price =", value, "payablePrice"); + public Criteria andRemarksEqualTo(String value) { + addCriterion("remarks =", value, "remarks"); return (Criteria) this; } - public Criteria andPayablePriceNotEqualTo(BigDecimal value) { - addCriterion("payable_price <>", value, "payablePrice"); + public Criteria andRemarksNotEqualTo(String value) { + addCriterion("remarks <>", value, "remarks"); return (Criteria) this; } - public Criteria andPayablePriceGreaterThan(BigDecimal value) { - addCriterion("payable_price >", value, "payablePrice"); + public Criteria andRemarksGreaterThan(String value) { + addCriterion("remarks >", value, "remarks"); return (Criteria) this; } - public Criteria andPayablePriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("payable_price >=", value, "payablePrice"); + public Criteria andRemarksGreaterThanOrEqualTo(String value) { + addCriterion("remarks >=", value, "remarks"); return (Criteria) this; } - public Criteria andPayablePriceLessThan(BigDecimal value) { - addCriterion("payable_price <", value, "payablePrice"); + public Criteria andRemarksLessThan(String value) { + addCriterion("remarks <", value, "remarks"); return (Criteria) this; } - public Criteria andPayablePriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("payable_price <=", value, "payablePrice"); + public Criteria andRemarksLessThanOrEqualTo(String value) { + addCriterion("remarks <=", value, "remarks"); return (Criteria) this; } - public Criteria andPayablePriceIn(List values) { - addCriterion("payable_price in", values, "payablePrice"); + public Criteria andRemarksLike(String value) { + addCriterion("remarks like", value, "remarks"); return (Criteria) this; } - public Criteria andPayablePriceNotIn(List values) { - addCriterion("payable_price not in", values, "payablePrice"); + public Criteria andRemarksNotLike(String value) { + addCriterion("remarks not like", value, "remarks"); return (Criteria) this; } - public Criteria andPayablePriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("payable_price between", value1, value2, "payablePrice"); + public Criteria andRemarksIn(List values) { + addCriterion("remarks in", values, "remarks"); return (Criteria) this; } - public Criteria andPayablePriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("payable_price not between", value1, value2, "payablePrice"); + public Criteria andRemarksNotIn(List values) { + addCriterion("remarks not in", values, "remarks"); return (Criteria) this; } - public Criteria andPayPriceIsNull() { - addCriterion("pay_price is null"); + public Criteria andRemarksBetween(String value1, String value2) { + addCriterion("remarks between", value1, value2, "remarks"); return (Criteria) this; } - public Criteria andPayPriceIsNotNull() { - addCriterion("pay_price is not null"); + public Criteria andRemarksNotBetween(String value1, String value2) { + addCriterion("remarks not between", value1, value2, "remarks"); return (Criteria) this; } - public Criteria andPayPriceEqualTo(BigDecimal value) { - addCriterion("pay_price =", value, "payPrice"); + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); return (Criteria) this; } - public Criteria andPayPriceNotEqualTo(BigDecimal value) { - addCriterion("pay_price <>", value, "payPrice"); + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); return (Criteria) this; } - public Criteria andPayPriceGreaterThan(BigDecimal value) { - addCriterion("pay_price >", value, "payPrice"); + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); return (Criteria) this; } - public Criteria andPayPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("pay_price >=", value, "payPrice"); + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); return (Criteria) this; } - public Criteria andPayPriceLessThan(BigDecimal value) { - addCriterion("pay_price <", value, "payPrice"); + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); return (Criteria) this; } - public Criteria andPayPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("pay_price <=", value, "payPrice"); + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); return (Criteria) this; } - public Criteria andPayPriceIn(List values) { - addCriterion("pay_price in", values, "payPrice"); + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); return (Criteria) this; } - public Criteria andPayPriceNotIn(List values) { - addCriterion("pay_price not in", values, "payPrice"); + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); return (Criteria) this; } - public Criteria andPayPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("pay_price between", value1, value2, "payPrice"); + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); return (Criteria) this; } - public Criteria andPayPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("pay_price not between", value1, value2, "payPrice"); + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); return (Criteria) this; } - public Criteria andPayRealPriceIsNull() { - addCriterion("pay_real_price is null"); + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); return (Criteria) this; } - public Criteria andPayRealPriceIsNotNull() { - addCriterion("pay_real_price is not null"); + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); return (Criteria) this; } - public Criteria andPayRealPriceEqualTo(BigDecimal value) { - addCriterion("pay_real_price =", value, "payRealPrice"); + public Criteria andTotalDeductionPriceIsNull() { + addCriterion("total_deduction_price is null"); return (Criteria) this; } - public Criteria andPayRealPriceNotEqualTo(BigDecimal value) { - addCriterion("pay_real_price <>", value, "payRealPrice"); + public Criteria andTotalDeductionPriceIsNotNull() { + addCriterion("total_deduction_price is not null"); return (Criteria) this; } - public Criteria andPayRealPriceGreaterThan(BigDecimal value) { - addCriterion("pay_real_price >", value, "payRealPrice"); + public Criteria andTotalDeductionPriceEqualTo(BigDecimal value) { + addCriterion("total_deduction_price =", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andPayRealPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("pay_real_price >=", value, "payRealPrice"); + public Criteria andTotalDeductionPriceNotEqualTo(BigDecimal value) { + addCriterion("total_deduction_price <>", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andPayRealPriceLessThan(BigDecimal value) { - addCriterion("pay_real_price <", value, "payRealPrice"); + public Criteria andTotalDeductionPriceGreaterThan(BigDecimal value) { + addCriterion("total_deduction_price >", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andPayRealPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("pay_real_price <=", value, "payRealPrice"); + public Criteria andTotalDeductionPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("total_deduction_price >=", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andPayRealPriceIn(List values) { - addCriterion("pay_real_price in", values, "payRealPrice"); + public Criteria andTotalDeductionPriceLessThan(BigDecimal value) { + addCriterion("total_deduction_price <", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andPayRealPriceNotIn(List values) { - addCriterion("pay_real_price not in", values, "payRealPrice"); + public Criteria andTotalDeductionPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("total_deduction_price <=", value, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andPayRealPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("pay_real_price between", value1, value2, "payRealPrice"); + public Criteria andTotalDeductionPriceIn(List values) { + addCriterion("total_deduction_price in", values, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andPayRealPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("pay_real_price not between", value1, value2, "payRealPrice"); + public Criteria andTotalDeductionPriceNotIn(List values) { + addCriterion("total_deduction_price not in", values, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andOrderStatusIsNull() { - addCriterion("order_status is null"); + public Criteria andTotalDeductionPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_deduction_price between", value1, value2, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andOrderStatusIsNotNull() { - addCriterion("order_status is not null"); + public Criteria andTotalDeductionPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_deduction_price not between", value1, value2, "totalDeductionPrice"); return (Criteria) this; } - public Criteria andOrderStatusEqualTo(Integer value) { - addCriterion("order_status =", value, "orderStatus"); + public Criteria andDeductionCouponPriceIsNull() { + addCriterion("deduction_coupon_price is null"); return (Criteria) this; } - public Criteria andOrderStatusNotEqualTo(Integer value) { - addCriterion("order_status <>", value, "orderStatus"); + public Criteria andDeductionCouponPriceIsNotNull() { + addCriterion("deduction_coupon_price is not null"); return (Criteria) this; } - public Criteria andOrderStatusGreaterThan(Integer value) { - addCriterion("order_status >", value, "orderStatus"); + public Criteria andDeductionCouponPriceEqualTo(BigDecimal value) { + addCriterion("deduction_coupon_price =", value, "deductionCouponPrice"); return (Criteria) this; } - public Criteria andOrderStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("order_status >=", value, "orderStatus"); + public Criteria andDeductionCouponPriceNotEqualTo(BigDecimal value) { + addCriterion("deduction_coupon_price <>", value, "deductionCouponPrice"); return (Criteria) this; } - public Criteria andOrderStatusLessThan(Integer value) { - addCriterion("order_status <", value, "orderStatus"); + public Criteria andDeductionCouponPriceGreaterThan(BigDecimal value) { + addCriterion("deduction_coupon_price >", value, "deductionCouponPrice"); return (Criteria) this; } - public Criteria andOrderStatusLessThanOrEqualTo(Integer value) { - addCriterion("order_status <=", value, "orderStatus"); + public Criteria andDeductionCouponPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("deduction_coupon_price >=", value, "deductionCouponPrice"); return (Criteria) this; } - public Criteria andOrderStatusIn(List values) { - addCriterion("order_status in", values, "orderStatus"); + public Criteria andDeductionCouponPriceLessThan(BigDecimal value) { + addCriterion("deduction_coupon_price <", value, "deductionCouponPrice"); return (Criteria) this; } - public Criteria andOrderStatusNotIn(List values) { - addCriterion("order_status not in", values, "orderStatus"); + public Criteria andDeductionCouponPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("deduction_coupon_price <=", value, "deductionCouponPrice"); return (Criteria) this; } - public Criteria andOrderStatusBetween(Integer value1, Integer value2) { - addCriterion("order_status between", value1, value2, "orderStatus"); + public Criteria andDeductionCouponPriceIn(List values) { + addCriterion("deduction_coupon_price in", values, "deductionCouponPrice"); return (Criteria) this; } - public Criteria andOrderStatusNotBetween(Integer value1, Integer value2) { - addCriterion("order_status not between", value1, value2, "orderStatus"); + public Criteria andDeductionCouponPriceNotIn(List values) { + addCriterion("deduction_coupon_price not in", values, "deductionCouponPrice"); return (Criteria) this; } - public Criteria andRemarksIsNull() { - addCriterion("remarks is null"); + public Criteria andDeductionCouponPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("deduction_coupon_price between", value1, value2, "deductionCouponPrice"); return (Criteria) this; } - public Criteria andRemarksIsNotNull() { - addCriterion("remarks is not null"); + public Criteria andDeductionCouponPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("deduction_coupon_price not between", value1, value2, "deductionCouponPrice"); return (Criteria) this; } - public Criteria andRemarksEqualTo(String value) { - addCriterion("remarks =", value, "remarks"); + public Criteria andDeductionProductPriceIsNull() { + addCriterion("deduction_product_price is null"); return (Criteria) this; } - public Criteria andRemarksNotEqualTo(String value) { - addCriterion("remarks <>", value, "remarks"); + public Criteria andDeductionProductPriceIsNotNull() { + addCriterion("deduction_product_price is not null"); return (Criteria) this; } - public Criteria andRemarksGreaterThan(String value) { - addCriterion("remarks >", value, "remarks"); + public Criteria andDeductionProductPriceEqualTo(BigDecimal value) { + addCriterion("deduction_product_price =", value, "deductionProductPrice"); return (Criteria) this; } - public Criteria andRemarksGreaterThanOrEqualTo(String value) { - addCriterion("remarks >=", value, "remarks"); + public Criteria andDeductionProductPriceNotEqualTo(BigDecimal value) { + addCriterion("deduction_product_price <>", value, "deductionProductPrice"); return (Criteria) this; } - public Criteria andRemarksLessThan(String value) { - addCriterion("remarks <", value, "remarks"); + public Criteria andDeductionProductPriceGreaterThan(BigDecimal value) { + addCriterion("deduction_product_price >", value, "deductionProductPrice"); return (Criteria) this; } - public Criteria andRemarksLessThanOrEqualTo(String value) { - addCriterion("remarks <=", value, "remarks"); + public Criteria andDeductionProductPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("deduction_product_price >=", value, "deductionProductPrice"); return (Criteria) this; } - public Criteria andRemarksLike(String value) { - addCriterion("remarks like", value, "remarks"); + public Criteria andDeductionProductPriceLessThan(BigDecimal value) { + addCriterion("deduction_product_price <", value, "deductionProductPrice"); return (Criteria) this; } - public Criteria andRemarksNotLike(String value) { - addCriterion("remarks not like", value, "remarks"); + public Criteria andDeductionProductPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("deduction_product_price <=", value, "deductionProductPrice"); return (Criteria) this; } - public Criteria andRemarksIn(List values) { - addCriterion("remarks in", values, "remarks"); + public Criteria andDeductionProductPriceIn(List values) { + addCriterion("deduction_product_price in", values, "deductionProductPrice"); return (Criteria) this; } - public Criteria andRemarksNotIn(List values) { - addCriterion("remarks not in", values, "remarks"); + public Criteria andDeductionProductPriceNotIn(List values) { + addCriterion("deduction_product_price not in", values, "deductionProductPrice"); return (Criteria) this; } - public Criteria andRemarksBetween(String value1, String value2) { - addCriterion("remarks between", value1, value2, "remarks"); + public Criteria andDeductionProductPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("deduction_product_price between", value1, value2, "deductionProductPrice"); return (Criteria) this; } - public Criteria andRemarksNotBetween(String value1, String value2) { - addCriterion("remarks not between", value1, value2, "remarks"); + public Criteria andDeductionProductPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("deduction_product_price not between", value1, value2, "deductionProductPrice"); return (Criteria) this; } - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); + public Criteria andPayGoldIsNull() { + addCriterion("pay_gold is null"); return (Criteria) this; } - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); + public Criteria andPayGoldIsNotNull() { + addCriterion("pay_gold is not null"); return (Criteria) this; } - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); + public Criteria andPayGoldEqualTo(Integer value) { + addCriterion("pay_gold =", value, "payGold"); return (Criteria) this; } - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); + public Criteria andPayGoldNotEqualTo(Integer value) { + addCriterion("pay_gold <>", value, "payGold"); return (Criteria) this; } - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); + public Criteria andPayGoldGreaterThan(Integer value) { + addCriterion("pay_gold >", value, "payGold"); return (Criteria) this; } - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); + public Criteria andPayGoldGreaterThanOrEqualTo(Integer value) { + addCriterion("pay_gold >=", value, "payGold"); return (Criteria) this; } - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); + public Criteria andPayGoldLessThan(Integer value) { + addCriterion("pay_gold <", value, "payGold"); return (Criteria) this; } - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); + public Criteria andPayGoldLessThanOrEqualTo(Integer value) { + addCriterion("pay_gold <=", value, "payGold"); return (Criteria) this; } - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); + public Criteria andPayGoldIn(List values) { + addCriterion("pay_gold in", values, "payGold"); return (Criteria) this; } - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); + public Criteria andPayGoldNotIn(List values) { + addCriterion("pay_gold not in", values, "payGold"); return (Criteria) this; } - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); + public Criteria andPayGoldBetween(Integer value1, Integer value2) { + addCriterion("pay_gold between", value1, value2, "payGold"); return (Criteria) this; } - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); + public Criteria andPayGoldNotBetween(Integer value1, Integer value2) { + addCriterion("pay_gold not between", value1, value2, "payGold"); return (Criteria) this; } @@ -2846,6 +2706,206 @@ public class HighOrderExample { return (Criteria) this; } + public Criteria andCompanyNameIsNull() { + addCriterion("company_name is null"); + return (Criteria) this; + } + + public Criteria andCompanyNameIsNotNull() { + addCriterion("company_name is not null"); + return (Criteria) this; + } + + public Criteria andCompanyNameEqualTo(String value) { + addCriterion("company_name =", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotEqualTo(String value) { + addCriterion("company_name <>", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameGreaterThan(String value) { + addCriterion("company_name >", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameGreaterThanOrEqualTo(String value) { + addCriterion("company_name >=", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLessThan(String value) { + addCriterion("company_name <", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLessThanOrEqualTo(String value) { + addCriterion("company_name <=", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLike(String value) { + addCriterion("company_name like", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotLike(String value) { + addCriterion("company_name not like", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameIn(List values) { + addCriterion("company_name in", values, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotIn(List values) { + addCriterion("company_name not in", values, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameBetween(String value1, String value2) { + addCriterion("company_name between", value1, value2, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotBetween(String value1, String value2) { + addCriterion("company_name not between", value1, value2, "companyName"); + return (Criteria) this; + } + + public Criteria andPromoteCodeIsNull() { + addCriterion("promote_code is null"); + return (Criteria) this; + } + + public Criteria andPromoteCodeIsNotNull() { + addCriterion("promote_code is not null"); + return (Criteria) this; + } + + public Criteria andPromoteCodeEqualTo(String value) { + addCriterion("promote_code =", value, "promoteCode"); + return (Criteria) this; + } + + public Criteria andPromoteCodeNotEqualTo(String value) { + addCriterion("promote_code <>", value, "promoteCode"); + return (Criteria) this; + } + + public Criteria andPromoteCodeGreaterThan(String value) { + addCriterion("promote_code >", value, "promoteCode"); + return (Criteria) this; + } + + public Criteria andPromoteCodeGreaterThanOrEqualTo(String value) { + addCriterion("promote_code >=", value, "promoteCode"); + return (Criteria) this; + } + + public Criteria andPromoteCodeLessThan(String value) { + addCriterion("promote_code <", value, "promoteCode"); + return (Criteria) this; + } + + public Criteria andPromoteCodeLessThanOrEqualTo(String value) { + addCriterion("promote_code <=", value, "promoteCode"); + return (Criteria) this; + } + + public Criteria andPromoteCodeLike(String value) { + addCriterion("promote_code like", value, "promoteCode"); + return (Criteria) this; + } + + public Criteria andPromoteCodeNotLike(String value) { + addCriterion("promote_code not like", value, "promoteCode"); + return (Criteria) this; + } + + public Criteria andPromoteCodeIn(List values) { + addCriterion("promote_code in", values, "promoteCode"); + return (Criteria) this; + } + + public Criteria andPromoteCodeNotIn(List values) { + addCriterion("promote_code not in", values, "promoteCode"); + return (Criteria) this; + } + + public Criteria andPromoteCodeBetween(String value1, String value2) { + addCriterion("promote_code between", value1, value2, "promoteCode"); + return (Criteria) this; + } + + public Criteria andPromoteCodeNotBetween(String value1, String value2) { + addCriterion("promote_code not between", value1, value2, "promoteCode"); + return (Criteria) this; + } + + public Criteria andSecUserIdIsNull() { + addCriterion("sec_user_id is null"); + return (Criteria) this; + } + + public Criteria andSecUserIdIsNotNull() { + addCriterion("sec_user_id is not null"); + return (Criteria) this; + } + + public Criteria andSecUserIdEqualTo(Long value) { + addCriterion("sec_user_id =", value, "secUserId"); + return (Criteria) this; + } + + public Criteria andSecUserIdNotEqualTo(Long value) { + addCriterion("sec_user_id <>", value, "secUserId"); + return (Criteria) this; + } + + public Criteria andSecUserIdGreaterThan(Long value) { + addCriterion("sec_user_id >", value, "secUserId"); + return (Criteria) this; + } + + public Criteria andSecUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("sec_user_id >=", value, "secUserId"); + return (Criteria) this; + } + + public Criteria andSecUserIdLessThan(Long value) { + addCriterion("sec_user_id <", value, "secUserId"); + return (Criteria) this; + } + + public Criteria andSecUserIdLessThanOrEqualTo(Long value) { + addCriterion("sec_user_id <=", value, "secUserId"); + return (Criteria) this; + } + + public Criteria andSecUserIdIn(List values) { + addCriterion("sec_user_id in", values, "secUserId"); + return (Criteria) this; + } + + public Criteria andSecUserIdNotIn(List values) { + addCriterion("sec_user_id not in", values, "secUserId"); + return (Criteria) this; + } + + public Criteria andSecUserIdBetween(Long value1, Long value2) { + addCriterion("sec_user_id between", value1, value2, "secUserId"); + return (Criteria) this; + } + + public Criteria andSecUserIdNotBetween(Long value1, Long value2) { + addCriterion("sec_user_id not between", value1, value2, "secUserId"); + return (Criteria) this; + } + public Criteria andExt1IsNull() { addCriterion("ext_1 is null"); return (Criteria) this;