From 864ce1790dff95f39e3451a3a13d1e644cb3b256 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Mon, 29 May 2023 14:24:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hai/dao/HighOrderMapper.java | 105 +++++----- .../com/hai/dao/HighOrderSqlProvider.java | 42 ++++ .../main/java/com/hai/entity/HighOrder.java | 81 +++++--- .../java/com/hai/entity/HighOrderExample.java | 190 ++++++++++++++++++ 4 files changed, 340 insertions(+), 78 deletions(-) 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 5c44e4e1..f8c17dee 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java @@ -43,48 +43,52 @@ public interface HighOrderMapper extends HighOrderMapperExt { "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, company_name, ", - "promote_code, sec_user_id, ", - "ext_1, ext_2, ext_3, ", - "ext_4, ext_5, ext_6)", + "combine_order_no, order_no, ", + "pay_serial_no, pay_type, ", + "mem_card_id, mem_card_type, ", + "mem_card_no, freight_price, ", + "goods_total_price, 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, ", + "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}, ", "#{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}, #{payablePrice,jdbcType=DECIMAL}, ", - "#{payPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ", - "#{orderStatus,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, ", - "#{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}, #{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})" + "#{combineOrderNo,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, ", + "#{paySerialNo,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", + "#{memCardId,jdbcType=BIGINT}, #{memCardType,jdbcType=INTEGER}, ", + "#{memCardNo,jdbcType=VARCHAR}, #{freightPrice,jdbcType=DECIMAL}, ", + "#{goodsTotalPrice,jdbcType=DECIMAL}, #{totalPrice,jdbcType=DECIMAL}, ", + "#{payablePrice,jdbcType=DECIMAL}, #{payPrice,jdbcType=DECIMAL}, ", + "#{payRealPrice,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER}, ", + "#{remarks,jdbcType=VARCHAR}, #{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}, ", + "#{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); @@ -105,12 +109,15 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="mem_id", property="memId", jdbcType=JdbcType.BIGINT), @Result(column="mem_name", property="memName", jdbcType=JdbcType.VARCHAR), @Result(column="mem_phone", property="memPhone", jdbcType=JdbcType.VARCHAR), + @Result(column="combine_order_no", property="combineOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="mem_card_id", property="memCardId", jdbcType=JdbcType.BIGINT), @Result(column="mem_card_type", property="memCardType", jdbcType=JdbcType.INTEGER), @Result(column="mem_card_no", property="memCardNo", jdbcType=JdbcType.VARCHAR), + @Result(column="freight_price", property="freightPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="goods_total_price", property="goodsTotalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="payable_price", property="payablePrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), @@ -151,14 +158,14 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Select({ "select", "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, company_name, promote_code, sec_user_id, ", - "ext_1, ext_2, ext_3, ext_4, ext_5, ext_6", + "mem_id, mem_name, mem_phone, combine_order_no, order_no, pay_serial_no, pay_type, ", + "mem_card_id, mem_card_type, mem_card_no, freight_price, goods_total_price, 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, 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}" }) @@ -173,12 +180,15 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="mem_id", property="memId", jdbcType=JdbcType.BIGINT), @Result(column="mem_name", property="memName", jdbcType=JdbcType.VARCHAR), @Result(column="mem_phone", property="memPhone", jdbcType=JdbcType.VARCHAR), + @Result(column="combine_order_no", property="combineOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="mem_card_id", property="memCardId", jdbcType=JdbcType.BIGINT), @Result(column="mem_card_type", property="memCardType", jdbcType=JdbcType.INTEGER), @Result(column="mem_card_no", property="memCardNo", jdbcType=JdbcType.VARCHAR), + @Result(column="freight_price", property="freightPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="goods_total_price", property="goodsTotalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="payable_price", property="payablePrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), @@ -236,12 +246,15 @@ public interface HighOrderMapper extends HighOrderMapperExt { "mem_id = #{memId,jdbcType=BIGINT},", "mem_name = #{memName,jdbcType=VARCHAR},", "mem_phone = #{memPhone,jdbcType=VARCHAR},", + "combine_order_no = #{combineOrderNo,jdbcType=VARCHAR},", "order_no = #{orderNo,jdbcType=VARCHAR},", "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},", "pay_type = #{payType,jdbcType=INTEGER},", "mem_card_id = #{memCardId,jdbcType=BIGINT},", "mem_card_type = #{memCardType,jdbcType=INTEGER},", "mem_card_no = #{memCardNo,jdbcType=VARCHAR},", + "freight_price = #{freightPrice,jdbcType=DECIMAL},", + "goods_total_price = #{goodsTotalPrice,jdbcType=DECIMAL},", "total_price = #{totalPrice,jdbcType=DECIMAL},", "payable_price = #{payablePrice,jdbcType=DECIMAL},", "pay_price = #{payPrice,jdbcType=DECIMAL},", 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 113b3dda..5c793bc1 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java @@ -64,6 +64,10 @@ public class HighOrderSqlProvider { sql.VALUES("mem_phone", "#{memPhone,jdbcType=VARCHAR}"); } + if (record.getCombineOrderNo() != null) { + sql.VALUES("combine_order_no", "#{combineOrderNo,jdbcType=VARCHAR}"); + } + if (record.getOrderNo() != null) { sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); } @@ -88,6 +92,14 @@ public class HighOrderSqlProvider { sql.VALUES("mem_card_no", "#{memCardNo,jdbcType=VARCHAR}"); } + if (record.getFreightPrice() != null) { + sql.VALUES("freight_price", "#{freightPrice,jdbcType=DECIMAL}"); + } + + if (record.getGoodsTotalPrice() != null) { + sql.VALUES("goods_total_price", "#{goodsTotalPrice,jdbcType=DECIMAL}"); + } + if (record.getTotalPrice() != null) { sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}"); } @@ -243,12 +255,15 @@ public class HighOrderSqlProvider { sql.SELECT("mem_id"); sql.SELECT("mem_name"); sql.SELECT("mem_phone"); + sql.SELECT("combine_order_no"); sql.SELECT("order_no"); sql.SELECT("pay_serial_no"); sql.SELECT("pay_type"); sql.SELECT("mem_card_id"); sql.SELECT("mem_card_type"); sql.SELECT("mem_card_no"); + sql.SELECT("freight_price"); + sql.SELECT("goods_total_price"); sql.SELECT("total_price"); sql.SELECT("payable_price"); sql.SELECT("pay_price"); @@ -340,6 +355,10 @@ public class HighOrderSqlProvider { sql.SET("mem_phone = #{record.memPhone,jdbcType=VARCHAR}"); } + if (record.getCombineOrderNo() != null) { + sql.SET("combine_order_no = #{record.combineOrderNo,jdbcType=VARCHAR}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); } @@ -364,6 +383,14 @@ public class HighOrderSqlProvider { sql.SET("mem_card_no = #{record.memCardNo,jdbcType=VARCHAR}"); } + if (record.getFreightPrice() != null) { + sql.SET("freight_price = #{record.freightPrice,jdbcType=DECIMAL}"); + } + + if (record.getGoodsTotalPrice() != null) { + sql.SET("goods_total_price = #{record.goodsTotalPrice,jdbcType=DECIMAL}"); + } + if (record.getTotalPrice() != null) { sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); } @@ -518,12 +545,15 @@ public class HighOrderSqlProvider { sql.SET("mem_id = #{record.memId,jdbcType=BIGINT}"); sql.SET("mem_name = #{record.memName,jdbcType=VARCHAR}"); sql.SET("mem_phone = #{record.memPhone,jdbcType=VARCHAR}"); + sql.SET("combine_order_no = #{record.combineOrderNo,jdbcType=VARCHAR}"); sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); sql.SET("mem_card_id = #{record.memCardId,jdbcType=BIGINT}"); sql.SET("mem_card_type = #{record.memCardType,jdbcType=INTEGER}"); sql.SET("mem_card_no = #{record.memCardNo,jdbcType=VARCHAR}"); + sql.SET("freight_price = #{record.freightPrice,jdbcType=DECIMAL}"); + sql.SET("goods_total_price = #{record.goodsTotalPrice,jdbcType=DECIMAL}"); sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); sql.SET("payable_price = #{record.payablePrice,jdbcType=DECIMAL}"); sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}"); @@ -604,6 +634,10 @@ public class HighOrderSqlProvider { sql.SET("mem_phone = #{memPhone,jdbcType=VARCHAR}"); } + if (record.getCombineOrderNo() != null) { + sql.SET("combine_order_no = #{combineOrderNo,jdbcType=VARCHAR}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); } @@ -628,6 +662,14 @@ public class HighOrderSqlProvider { sql.SET("mem_card_no = #{memCardNo,jdbcType=VARCHAR}"); } + if (record.getFreightPrice() != null) { + sql.SET("freight_price = #{freightPrice,jdbcType=DECIMAL}"); + } + + if (record.getGoodsTotalPrice() != null) { + sql.SET("goods_total_price = #{goodsTotalPrice,jdbcType=DECIMAL}"); + } + if (record.getTotalPrice() != null) { sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}"); } 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 ccf71fbc..5c6e78b0 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 @@ -77,6 +76,11 @@ public class HighOrder implements Serializable { */ private String memPhone; + /** + * 合单订单号 + */ + private String combineOrderNo; + /** * 订单号 */ @@ -107,6 +111,16 @@ public class HighOrder implements Serializable { */ private String memCardNo; + /** + * 运费 + */ + private BigDecimal freightPrice; + + /** + * 商品总金额 + */ + private BigDecimal goodsTotalPrice; + /** * 交易总金额 */ @@ -262,38 +276,8 @@ public class HighOrder implements Serializable { */ 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; } @@ -374,6 +358,14 @@ public class HighOrder implements Serializable { this.memPhone = memPhone; } + public String getCombineOrderNo() { + return combineOrderNo; + } + + public void setCombineOrderNo(String combineOrderNo) { + this.combineOrderNo = combineOrderNo; + } + public String getOrderNo() { return orderNo; } @@ -422,6 +414,22 @@ public class HighOrder implements Serializable { this.memCardNo = memCardNo; } + public BigDecimal getFreightPrice() { + return freightPrice; + } + + public void setFreightPrice(BigDecimal freightPrice) { + this.freightPrice = freightPrice; + } + + public BigDecimal getGoodsTotalPrice() { + return goodsTotalPrice; + } + + public void setGoodsTotalPrice(BigDecimal goodsTotalPrice) { + this.goodsTotalPrice = goodsTotalPrice; + } + public BigDecimal getTotalPrice() { return totalPrice; } @@ -716,12 +724,15 @@ public class HighOrder implements Serializable { && (this.getMemId() == null ? other.getMemId() == null : this.getMemId().equals(other.getMemId())) && (this.getMemName() == null ? other.getMemName() == null : this.getMemName().equals(other.getMemName())) && (this.getMemPhone() == null ? other.getMemPhone() == null : this.getMemPhone().equals(other.getMemPhone())) + && (this.getCombineOrderNo() == null ? other.getCombineOrderNo() == null : this.getCombineOrderNo().equals(other.getCombineOrderNo())) && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) && (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo())) && (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType())) && (this.getMemCardId() == null ? other.getMemCardId() == null : this.getMemCardId().equals(other.getMemCardId())) && (this.getMemCardType() == null ? other.getMemCardType() == null : this.getMemCardType().equals(other.getMemCardType())) && (this.getMemCardNo() == null ? other.getMemCardNo() == null : this.getMemCardNo().equals(other.getMemCardNo())) + && (this.getFreightPrice() == null ? other.getFreightPrice() == null : this.getFreightPrice().equals(other.getFreightPrice())) + && (this.getGoodsTotalPrice() == null ? other.getGoodsTotalPrice() == null : this.getGoodsTotalPrice().equals(other.getGoodsTotalPrice())) && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice())) && (this.getPayablePrice() == null ? other.getPayablePrice() == null : this.getPayablePrice().equals(other.getPayablePrice())) && (this.getPayPrice() == null ? other.getPayPrice() == null : this.getPayPrice().equals(other.getPayPrice())) @@ -772,12 +783,15 @@ public class HighOrder implements Serializable { result = prime * result + ((getMemId() == null) ? 0 : getMemId().hashCode()); result = prime * result + ((getMemName() == null) ? 0 : getMemName().hashCode()); result = prime * result + ((getMemPhone() == null) ? 0 : getMemPhone().hashCode()); + result = prime * result + ((getCombineOrderNo() == null) ? 0 : getCombineOrderNo().hashCode()); result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode()); result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode()); result = prime * result + ((getMemCardId() == null) ? 0 : getMemCardId().hashCode()); result = prime * result + ((getMemCardType() == null) ? 0 : getMemCardType().hashCode()); result = prime * result + ((getMemCardNo() == null) ? 0 : getMemCardNo().hashCode()); + result = prime * result + ((getFreightPrice() == null) ? 0 : getFreightPrice().hashCode()); + result = prime * result + ((getGoodsTotalPrice() == null) ? 0 : getGoodsTotalPrice().hashCode()); result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode()); result = prime * result + ((getPayablePrice() == null) ? 0 : getPayablePrice().hashCode()); result = prime * result + ((getPayPrice() == null) ? 0 : getPayPrice().hashCode()); @@ -831,12 +845,15 @@ public class HighOrder implements Serializable { sb.append(", memId=").append(memId); sb.append(", memName=").append(memName); sb.append(", memPhone=").append(memPhone); + sb.append(", combineOrderNo=").append(combineOrderNo); sb.append(", orderNo=").append(orderNo); sb.append(", paySerialNo=").append(paySerialNo); sb.append(", payType=").append(payType); sb.append(", memCardId=").append(memCardId); sb.append(", memCardType=").append(memCardType); sb.append(", memCardNo=").append(memCardNo); + sb.append(", freightPrice=").append(freightPrice); + sb.append(", goodsTotalPrice=").append(goodsTotalPrice); sb.append(", totalPrice=").append(totalPrice); sb.append(", payablePrice=").append(payablePrice); sb.append(", payPrice=").append(payPrice); @@ -875,4 +892,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 1bb72bd9..9cbd45d9 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java @@ -776,6 +776,76 @@ public class HighOrderExample { return (Criteria) this; } + public Criteria andCombineOrderNoIsNull() { + addCriterion("combine_order_no is null"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoIsNotNull() { + addCriterion("combine_order_no is not null"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoEqualTo(String value) { + addCriterion("combine_order_no =", value, "combineOrderNo"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoNotEqualTo(String value) { + addCriterion("combine_order_no <>", value, "combineOrderNo"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoGreaterThan(String value) { + addCriterion("combine_order_no >", value, "combineOrderNo"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("combine_order_no >=", value, "combineOrderNo"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoLessThan(String value) { + addCriterion("combine_order_no <", value, "combineOrderNo"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoLessThanOrEqualTo(String value) { + addCriterion("combine_order_no <=", value, "combineOrderNo"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoLike(String value) { + addCriterion("combine_order_no like", value, "combineOrderNo"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoNotLike(String value) { + addCriterion("combine_order_no not like", value, "combineOrderNo"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoIn(List values) { + addCriterion("combine_order_no in", values, "combineOrderNo"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoNotIn(List values) { + addCriterion("combine_order_no not in", values, "combineOrderNo"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoBetween(String value1, String value2) { + addCriterion("combine_order_no between", value1, value2, "combineOrderNo"); + return (Criteria) this; + } + + public Criteria andCombineOrderNoNotBetween(String value1, String value2) { + addCriterion("combine_order_no not between", value1, value2, "combineOrderNo"); + return (Criteria) this; + } + public Criteria andOrderNoIsNull() { addCriterion("order_no is null"); return (Criteria) this; @@ -1166,6 +1236,126 @@ public class HighOrderExample { return (Criteria) this; } + public Criteria andFreightPriceIsNull() { + addCriterion("freight_price is null"); + return (Criteria) this; + } + + public Criteria andFreightPriceIsNotNull() { + addCriterion("freight_price is not null"); + return (Criteria) this; + } + + public Criteria andFreightPriceEqualTo(BigDecimal value) { + addCriterion("freight_price =", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceNotEqualTo(BigDecimal value) { + addCriterion("freight_price <>", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceGreaterThan(BigDecimal value) { + addCriterion("freight_price >", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("freight_price >=", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceLessThan(BigDecimal value) { + addCriterion("freight_price <", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("freight_price <=", value, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceIn(List values) { + addCriterion("freight_price in", values, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceNotIn(List values) { + addCriterion("freight_price not in", values, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("freight_price between", value1, value2, "freightPrice"); + return (Criteria) this; + } + + public Criteria andFreightPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("freight_price not between", value1, value2, "freightPrice"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceIsNull() { + addCriterion("goods_total_price is null"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceIsNotNull() { + addCriterion("goods_total_price is not null"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceEqualTo(BigDecimal value) { + addCriterion("goods_total_price =", value, "goodsTotalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceNotEqualTo(BigDecimal value) { + addCriterion("goods_total_price <>", value, "goodsTotalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceGreaterThan(BigDecimal value) { + addCriterion("goods_total_price >", value, "goodsTotalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("goods_total_price >=", value, "goodsTotalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceLessThan(BigDecimal value) { + addCriterion("goods_total_price <", value, "goodsTotalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("goods_total_price <=", value, "goodsTotalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceIn(List values) { + addCriterion("goods_total_price in", values, "goodsTotalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceNotIn(List values) { + addCriterion("goods_total_price not in", values, "goodsTotalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("goods_total_price between", value1, value2, "goodsTotalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsTotalPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("goods_total_price not between", value1, value2, "goodsTotalPrice"); + return (Criteria) this; + } + public Criteria andTotalPriceIsNull() { addCriterion("total_price is null"); return (Criteria) this;