diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java index 655492c3..30e23d29 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java @@ -47,12 +47,13 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "labor_union_card, integral_num, ", "discount_deduction_price, integral_deduction_price, ", "pay_real_price, pay_serial_no, ", - "pay_status, recharge_status, ", "create_timed, pay_time, ", "cancel_time, finish_time, ", - "out_refund_no, refund_time, ", - "tp_refund_order_no, refund_fee, ", - "ext_1, ext_2, ext_3)", + "out_refund_no, order_price, ", + "refund_time, tp_refund_order_no, ", + "refund_fee, pay_status, ", + "recharge_status, ext_1, ", + "ext_2, ext_3)", "values (#{orderNo,jdbcType=VARCHAR}, #{rechargeType,jdbcType=INTEGER}, ", "#{memDiscountId,jdbcType=BIGINT}, #{memDiscountName,jdbcType=VARCHAR}, ", "#{userId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, ", @@ -61,12 +62,13 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "#{laborUnionCard,jdbcType=VARCHAR}, #{integralNum,jdbcType=BIGINT}, ", "#{discountDeductionPrice,jdbcType=DECIMAL}, #{integralDeductionPrice,jdbcType=DECIMAL}, ", "#{payRealPrice,jdbcType=DECIMAL}, #{paySerialNo,jdbcType=VARCHAR}, ", - "#{payStatus,jdbcType=INTEGER}, #{rechargeStatus,jdbcType=INTEGER}, ", "#{createTimed,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ", "#{cancelTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ", - "#{outRefundNo,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, ", - "#{tpRefundOrderNo,jdbcType=VARCHAR}, #{refundFee,jdbcType=DECIMAL}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{outRefundNo,jdbcType=VARCHAR}, #{orderPrice,jdbcType=DECIMAL}, ", + "#{refundTime,jdbcType=TIMESTAMP}, #{tpRefundOrderNo,jdbcType=VARCHAR}, ", + "#{refundFee,jdbcType=DECIMAL}, #{payStatus,jdbcType=INTEGER}, ", + "#{rechargeStatus,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(OutRechargeOrder record); @@ -94,16 +96,17 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @Result(column="integral_deduction_price", property="integralDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), - @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), - @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), @Result(column="create_timed", property="createTimed", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="out_refund_no", property="outRefundNo", jdbcType=JdbcType.VARCHAR), + @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="tp_refund_order_no", property="tpRefundOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL), + @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), @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) @@ -115,8 +118,9 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "id, order_no, recharge_type, mem_discount_id, mem_discount_name, user_id, user_name, ", "user_phone, goods_id, recharge_content, pay_type, labor_union_card, integral_num, ", "discount_deduction_price, integral_deduction_price, pay_real_price, pay_serial_no, ", - "pay_status, recharge_status, create_timed, pay_time, cancel_time, finish_time, ", - "out_refund_no, refund_time, tp_refund_order_no, refund_fee, ext_1, ext_2, ext_3", + "create_timed, pay_time, cancel_time, finish_time, out_refund_no, order_price, ", + "refund_time, tp_refund_order_no, refund_fee, pay_status, recharge_status, ext_1, ", + "ext_2, ext_3", "from out_recharge_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -138,16 +142,17 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @Result(column="integral_deduction_price", property="integralDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), - @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), - @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), @Result(column="create_timed", property="createTimed", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="out_refund_no", property="outRefundNo", jdbcType=JdbcType.VARCHAR), + @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="tp_refund_order_no", property="tpRefundOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL), + @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), @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) @@ -181,16 +186,17 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "integral_deduction_price = #{integralDeductionPrice,jdbcType=DECIMAL},", "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},", "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},", - "pay_status = #{payStatus,jdbcType=INTEGER},", - "recharge_status = #{rechargeStatus,jdbcType=INTEGER},", "create_timed = #{createTimed,jdbcType=TIMESTAMP},", "pay_time = #{payTime,jdbcType=TIMESTAMP},", "cancel_time = #{cancelTime,jdbcType=TIMESTAMP},", "finish_time = #{finishTime,jdbcType=TIMESTAMP},", "out_refund_no = #{outRefundNo,jdbcType=VARCHAR},", + "order_price = #{orderPrice,jdbcType=DECIMAL},", "refund_time = #{refundTime,jdbcType=TIMESTAMP},", "tp_refund_order_no = #{tpRefundOrderNo,jdbcType=VARCHAR},", "refund_fee = #{refundFee,jdbcType=DECIMAL},", + "pay_status = #{payStatus,jdbcType=INTEGER},", + "recharge_status = #{rechargeStatus,jdbcType=INTEGER},", "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/OutRechargeOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java index 1fbd7a2f..43fd5640 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java @@ -92,14 +92,6 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("pay_serial_no", "#{paySerialNo,jdbcType=VARCHAR}"); } - if (record.getPayStatus() != null) { - sql.VALUES("pay_status", "#{payStatus,jdbcType=INTEGER}"); - } - - if (record.getRechargeStatus() != null) { - sql.VALUES("recharge_status", "#{rechargeStatus,jdbcType=INTEGER}"); - } - if (record.getCreateTimed() != null) { sql.VALUES("create_timed", "#{createTimed,jdbcType=TIMESTAMP}"); } @@ -120,6 +112,10 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("out_refund_no", "#{outRefundNo,jdbcType=VARCHAR}"); } + if (record.getOrderPrice() != null) { + sql.VALUES("order_price", "#{orderPrice,jdbcType=DECIMAL}"); + } + if (record.getRefundTime() != null) { sql.VALUES("refund_time", "#{refundTime,jdbcType=TIMESTAMP}"); } @@ -132,6 +128,14 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("refund_fee", "#{refundFee,jdbcType=DECIMAL}"); } + if (record.getPayStatus() != null) { + sql.VALUES("pay_status", "#{payStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeStatus() != null) { + sql.VALUES("recharge_status", "#{rechargeStatus,jdbcType=INTEGER}"); + } + if (record.getExt1() != null) { sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); } @@ -170,16 +174,17 @@ public class OutRechargeOrderSqlProvider { sql.SELECT("integral_deduction_price"); sql.SELECT("pay_real_price"); sql.SELECT("pay_serial_no"); - sql.SELECT("pay_status"); - sql.SELECT("recharge_status"); sql.SELECT("create_timed"); sql.SELECT("pay_time"); sql.SELECT("cancel_time"); sql.SELECT("finish_time"); sql.SELECT("out_refund_no"); + sql.SELECT("order_price"); sql.SELECT("refund_time"); sql.SELECT("tp_refund_order_no"); sql.SELECT("refund_fee"); + sql.SELECT("pay_status"); + sql.SELECT("recharge_status"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); sql.SELECT("ext_3"); @@ -268,14 +273,6 @@ public class OutRechargeOrderSqlProvider { sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); } - if (record.getPayStatus() != null) { - sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); - } - - if (record.getRechargeStatus() != null) { - sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); - } - if (record.getCreateTimed() != null) { sql.SET("create_timed = #{record.createTimed,jdbcType=TIMESTAMP}"); } @@ -296,6 +293,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("out_refund_no = #{record.outRefundNo,jdbcType=VARCHAR}"); } + if (record.getOrderPrice() != null) { + sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); + } + if (record.getRefundTime() != null) { sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); } @@ -308,6 +309,14 @@ public class OutRechargeOrderSqlProvider { sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}"); } + if (record.getPayStatus() != null) { + sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeStatus() != null) { + sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); } @@ -345,16 +354,17 @@ public class OutRechargeOrderSqlProvider { sql.SET("integral_deduction_price = #{record.integralDeductionPrice,jdbcType=DECIMAL}"); sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); - sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); - sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); sql.SET("create_timed = #{record.createTimed,jdbcType=TIMESTAMP}"); sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}"); sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); sql.SET("out_refund_no = #{record.outRefundNo,jdbcType=VARCHAR}"); + sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); sql.SET("tp_refund_order_no = #{record.tpRefundOrderNo,jdbcType=VARCHAR}"); sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}"); + sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); + sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); @@ -432,14 +442,6 @@ public class OutRechargeOrderSqlProvider { sql.SET("pay_serial_no = #{paySerialNo,jdbcType=VARCHAR}"); } - if (record.getPayStatus() != null) { - sql.SET("pay_status = #{payStatus,jdbcType=INTEGER}"); - } - - if (record.getRechargeStatus() != null) { - sql.SET("recharge_status = #{rechargeStatus,jdbcType=INTEGER}"); - } - if (record.getCreateTimed() != null) { sql.SET("create_timed = #{createTimed,jdbcType=TIMESTAMP}"); } @@ -460,6 +462,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("out_refund_no = #{outRefundNo,jdbcType=VARCHAR}"); } + if (record.getOrderPrice() != null) { + sql.SET("order_price = #{orderPrice,jdbcType=DECIMAL}"); + } + if (record.getRefundTime() != null) { sql.SET("refund_time = #{refundTime,jdbcType=TIMESTAMP}"); } @@ -472,6 +478,14 @@ public class OutRechargeOrderSqlProvider { sql.SET("refund_fee = #{refundFee,jdbcType=DECIMAL}"); } + if (record.getPayStatus() != null) { + sql.SET("pay_status = #{payStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeStatus() != null) { + sql.SET("recharge_status = #{rechargeStatus,jdbcType=INTEGER}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); } diff --git a/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java b/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java index 739658c0..41c299ca 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java @@ -99,16 +99,6 @@ public class OutRechargeOrder implements Serializable { */ private String paySerialNo; - /** - * 订单支付状态 : 101.待支付 102.已支付 100.已完成 104.已取消 105.已退款 - */ - private Integer payStatus; - - /** - * 充值状态:201:充值中 202:充值成功 203:充值失败' - */ - private Integer rechargeStatus; - /** * 生成时间 */ @@ -134,6 +124,11 @@ public class OutRechargeOrder implements Serializable { */ private String outRefundNo; + /** + * 订单金额 + */ + private BigDecimal orderPrice; + /** * 退款时间 */ @@ -149,6 +144,16 @@ public class OutRechargeOrder implements Serializable { */ private BigDecimal refundFee; + /** + * 订单支付状态 : 101.待支付 102.已支付 100.已完成 104.已取消 105.已退款 + */ + private Integer payStatus; + + /** + * 充值状态:201:充值中 202:充值成功 203:充值失败' + */ + private Integer rechargeStatus; + private String ext1; private String ext2; @@ -293,22 +298,6 @@ public class OutRechargeOrder implements Serializable { this.paySerialNo = paySerialNo; } - public Integer getPayStatus() { - return payStatus; - } - - public void setPayStatus(Integer payStatus) { - this.payStatus = payStatus; - } - - public Integer getRechargeStatus() { - return rechargeStatus; - } - - public void setRechargeStatus(Integer rechargeStatus) { - this.rechargeStatus = rechargeStatus; - } - public Date getCreateTimed() { return createTimed; } @@ -349,6 +338,14 @@ public class OutRechargeOrder implements Serializable { this.outRefundNo = outRefundNo; } + public BigDecimal getOrderPrice() { + return orderPrice; + } + + public void setOrderPrice(BigDecimal orderPrice) { + this.orderPrice = orderPrice; + } + public Date getRefundTime() { return refundTime; } @@ -373,6 +370,22 @@ public class OutRechargeOrder implements Serializable { this.refundFee = refundFee; } + public Integer getPayStatus() { + return payStatus; + } + + public void setPayStatus(Integer payStatus) { + this.payStatus = payStatus; + } + + public Integer getRechargeStatus() { + return rechargeStatus; + } + + public void setRechargeStatus(Integer rechargeStatus) { + this.rechargeStatus = rechargeStatus; + } + public String getExt1() { return ext1; } @@ -426,16 +439,17 @@ public class OutRechargeOrder implements Serializable { && (this.getIntegralDeductionPrice() == null ? other.getIntegralDeductionPrice() == null : this.getIntegralDeductionPrice().equals(other.getIntegralDeductionPrice())) && (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice())) && (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo())) - && (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus())) - && (this.getRechargeStatus() == null ? other.getRechargeStatus() == null : this.getRechargeStatus().equals(other.getRechargeStatus())) && (this.getCreateTimed() == null ? other.getCreateTimed() == null : this.getCreateTimed().equals(other.getCreateTimed())) && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) && (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime())) && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime())) && (this.getOutRefundNo() == null ? other.getOutRefundNo() == null : this.getOutRefundNo().equals(other.getOutRefundNo())) + && (this.getOrderPrice() == null ? other.getOrderPrice() == null : this.getOrderPrice().equals(other.getOrderPrice())) && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) && (this.getTpRefundOrderNo() == null ? other.getTpRefundOrderNo() == null : this.getTpRefundOrderNo().equals(other.getTpRefundOrderNo())) && (this.getRefundFee() == null ? other.getRefundFee() == null : this.getRefundFee().equals(other.getRefundFee())) + && (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus())) + && (this.getRechargeStatus() == null ? other.getRechargeStatus() == null : this.getRechargeStatus().equals(other.getRechargeStatus())) && (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())); @@ -462,16 +476,17 @@ public class OutRechargeOrder implements Serializable { result = prime * result + ((getIntegralDeductionPrice() == null) ? 0 : getIntegralDeductionPrice().hashCode()); result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode()); result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode()); - result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode()); - result = prime * result + ((getRechargeStatus() == null) ? 0 : getRechargeStatus().hashCode()); result = prime * result + ((getCreateTimed() == null) ? 0 : getCreateTimed().hashCode()); result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); result = prime * result + ((getCancelTime() == null) ? 0 : getCancelTime().hashCode()); result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode()); result = prime * result + ((getOutRefundNo() == null) ? 0 : getOutRefundNo().hashCode()); + result = prime * result + ((getOrderPrice() == null) ? 0 : getOrderPrice().hashCode()); result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode()); result = prime * result + ((getTpRefundOrderNo() == null) ? 0 : getTpRefundOrderNo().hashCode()); result = prime * result + ((getRefundFee() == null) ? 0 : getRefundFee().hashCode()); + result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode()); + result = prime * result + ((getRechargeStatus() == null) ? 0 : getRechargeStatus().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()); @@ -501,16 +516,17 @@ public class OutRechargeOrder implements Serializable { sb.append(", integralDeductionPrice=").append(integralDeductionPrice); sb.append(", payRealPrice=").append(payRealPrice); sb.append(", paySerialNo=").append(paySerialNo); - sb.append(", payStatus=").append(payStatus); - sb.append(", rechargeStatus=").append(rechargeStatus); sb.append(", createTimed=").append(createTimed); sb.append(", payTime=").append(payTime); sb.append(", cancelTime=").append(cancelTime); sb.append(", finishTime=").append(finishTime); sb.append(", outRefundNo=").append(outRefundNo); + sb.append(", orderPrice=").append(orderPrice); sb.append(", refundTime=").append(refundTime); sb.append(", tpRefundOrderNo=").append(tpRefundOrderNo); sb.append(", refundFee=").append(refundFee); + sb.append(", payStatus=").append(payStatus); + sb.append(", rechargeStatus=").append(rechargeStatus); sb.append(", ext1=").append(ext1); sb.append(", ext2=").append(ext2); sb.append(", ext3=").append(ext3); diff --git a/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java b/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java index 5b78dbbb..effbb561 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java @@ -1216,126 +1216,6 @@ public class OutRechargeOrderExample { return (Criteria) this; } - public Criteria andPayStatusIsNull() { - addCriterion("pay_status is null"); - return (Criteria) this; - } - - public Criteria andPayStatusIsNotNull() { - addCriterion("pay_status is not null"); - return (Criteria) this; - } - - public Criteria andPayStatusEqualTo(Integer value) { - addCriterion("pay_status =", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusNotEqualTo(Integer value) { - addCriterion("pay_status <>", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusGreaterThan(Integer value) { - addCriterion("pay_status >", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("pay_status >=", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusLessThan(Integer value) { - addCriterion("pay_status <", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusLessThanOrEqualTo(Integer value) { - addCriterion("pay_status <=", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusIn(List values) { - addCriterion("pay_status in", values, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusNotIn(List values) { - addCriterion("pay_status not in", values, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusBetween(Integer value1, Integer value2) { - addCriterion("pay_status between", value1, value2, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusNotBetween(Integer value1, Integer value2) { - addCriterion("pay_status not between", value1, value2, "payStatus"); - return (Criteria) this; - } - - public Criteria andRechargeStatusIsNull() { - addCriterion("recharge_status is null"); - return (Criteria) this; - } - - public Criteria andRechargeStatusIsNotNull() { - addCriterion("recharge_status is not null"); - return (Criteria) this; - } - - public Criteria andRechargeStatusEqualTo(Integer value) { - addCriterion("recharge_status =", value, "rechargeStatus"); - return (Criteria) this; - } - - public Criteria andRechargeStatusNotEqualTo(Integer value) { - addCriterion("recharge_status <>", value, "rechargeStatus"); - return (Criteria) this; - } - - public Criteria andRechargeStatusGreaterThan(Integer value) { - addCriterion("recharge_status >", value, "rechargeStatus"); - return (Criteria) this; - } - - public Criteria andRechargeStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("recharge_status >=", value, "rechargeStatus"); - return (Criteria) this; - } - - public Criteria andRechargeStatusLessThan(Integer value) { - addCriterion("recharge_status <", value, "rechargeStatus"); - return (Criteria) this; - } - - public Criteria andRechargeStatusLessThanOrEqualTo(Integer value) { - addCriterion("recharge_status <=", value, "rechargeStatus"); - return (Criteria) this; - } - - public Criteria andRechargeStatusIn(List values) { - addCriterion("recharge_status in", values, "rechargeStatus"); - return (Criteria) this; - } - - public Criteria andRechargeStatusNotIn(List values) { - addCriterion("recharge_status not in", values, "rechargeStatus"); - return (Criteria) this; - } - - public Criteria andRechargeStatusBetween(Integer value1, Integer value2) { - addCriterion("recharge_status between", value1, value2, "rechargeStatus"); - return (Criteria) this; - } - - public Criteria andRechargeStatusNotBetween(Integer value1, Integer value2) { - addCriterion("recharge_status not between", value1, value2, "rechargeStatus"); - return (Criteria) this; - } - public Criteria andCreateTimedIsNull() { addCriterion("create_timed is null"); return (Criteria) this; @@ -1646,6 +1526,66 @@ public class OutRechargeOrderExample { return (Criteria) this; } + public Criteria andOrderPriceIsNull() { + addCriterion("order_price is null"); + return (Criteria) this; + } + + public Criteria andOrderPriceIsNotNull() { + addCriterion("order_price is not null"); + return (Criteria) this; + } + + public Criteria andOrderPriceEqualTo(BigDecimal value) { + addCriterion("order_price =", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceNotEqualTo(BigDecimal value) { + addCriterion("order_price <>", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceGreaterThan(BigDecimal value) { + addCriterion("order_price >", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("order_price >=", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceLessThan(BigDecimal value) { + addCriterion("order_price <", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("order_price <=", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceIn(List values) { + addCriterion("order_price in", values, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceNotIn(List values) { + addCriterion("order_price not in", values, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("order_price between", value1, value2, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("order_price not between", value1, value2, "orderPrice"); + return (Criteria) this; + } + public Criteria andRefundTimeIsNull() { addCriterion("refund_time is null"); return (Criteria) this; @@ -1836,6 +1776,126 @@ public class OutRechargeOrderExample { return (Criteria) this; } + public Criteria andPayStatusIsNull() { + addCriterion("pay_status is null"); + return (Criteria) this; + } + + public Criteria andPayStatusIsNotNull() { + addCriterion("pay_status is not null"); + return (Criteria) this; + } + + public Criteria andPayStatusEqualTo(Integer value) { + addCriterion("pay_status =", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusNotEqualTo(Integer value) { + addCriterion("pay_status <>", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusGreaterThan(Integer value) { + addCriterion("pay_status >", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("pay_status >=", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusLessThan(Integer value) { + addCriterion("pay_status <", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusLessThanOrEqualTo(Integer value) { + addCriterion("pay_status <=", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusIn(List values) { + addCriterion("pay_status in", values, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusNotIn(List values) { + addCriterion("pay_status not in", values, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusBetween(Integer value1, Integer value2) { + addCriterion("pay_status between", value1, value2, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusNotBetween(Integer value1, Integer value2) { + addCriterion("pay_status not between", value1, value2, "payStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusIsNull() { + addCriterion("recharge_status is null"); + return (Criteria) this; + } + + public Criteria andRechargeStatusIsNotNull() { + addCriterion("recharge_status is not null"); + return (Criteria) this; + } + + public Criteria andRechargeStatusEqualTo(Integer value) { + addCriterion("recharge_status =", value, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusNotEqualTo(Integer value) { + addCriterion("recharge_status <>", value, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusGreaterThan(Integer value) { + addCriterion("recharge_status >", value, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("recharge_status >=", value, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusLessThan(Integer value) { + addCriterion("recharge_status <", value, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusLessThanOrEqualTo(Integer value) { + addCriterion("recharge_status <=", value, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusIn(List values) { + addCriterion("recharge_status in", values, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusNotIn(List values) { + addCriterion("recharge_status not in", values, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusBetween(Integer value1, Integer value2) { + addCriterion("recharge_status between", value1, value2, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusNotBetween(Integer value1, Integer value2) { + addCriterion("recharge_status not between", value1, value2, "rechargeStatus"); + return (Criteria) this; + } + public Criteria andExt1IsNull() { addCriterion("ext_1 is null"); return (Criteria) this;