From 6f9b04e25b17625577bc96d16f5555907d980b3e Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Wed, 25 May 2022 16:48:33 +0800 Subject: [PATCH] 1 --- .../com/hai/dao/OutRechargeOrderMapper.java | 19 ++--- .../hai/dao/OutRechargeOrderSqlProvider.java | 14 ++++ .../java/com/hai/entity/OutRechargeOrder.java | 18 ++++- .../hai/entity/OutRechargeOrderExample.java | 70 +++++++++++++++++++ 4 files changed, 112 insertions(+), 9 deletions(-) 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 30e23d29..2807315d 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java @@ -51,9 +51,9 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "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)", + "refund_id, 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}, ", @@ -66,9 +66,9 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "#{cancelTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ", "#{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})" + "#{refundId,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); @@ -104,6 +104,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @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_id", property="refundId", 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), @@ -119,8 +120,8 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "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, ", "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", + "refund_time, tp_refund_order_no, refund_id, refund_fee, pay_status, recharge_status, ", + "ext_1, ext_2, ext_3", "from out_recharge_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -150,6 +151,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @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_id", property="refundId", 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), @@ -194,6 +196,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "order_price = #{orderPrice,jdbcType=DECIMAL},", "refund_time = #{refundTime,jdbcType=TIMESTAMP},", "tp_refund_order_no = #{tpRefundOrderNo,jdbcType=VARCHAR},", + "refund_id = #{refundId,jdbcType=VARCHAR},", "refund_fee = #{refundFee,jdbcType=DECIMAL},", "pay_status = #{payStatus,jdbcType=INTEGER},", "recharge_status = #{rechargeStatus,jdbcType=INTEGER},", 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 43fd5640..97c8bff1 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java @@ -124,6 +124,10 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("tp_refund_order_no", "#{tpRefundOrderNo,jdbcType=VARCHAR}"); } + if (record.getRefundId() != null) { + sql.VALUES("refund_id", "#{refundId,jdbcType=VARCHAR}"); + } + if (record.getRefundFee() != null) { sql.VALUES("refund_fee", "#{refundFee,jdbcType=DECIMAL}"); } @@ -182,6 +186,7 @@ public class OutRechargeOrderSqlProvider { sql.SELECT("order_price"); sql.SELECT("refund_time"); sql.SELECT("tp_refund_order_no"); + sql.SELECT("refund_id"); sql.SELECT("refund_fee"); sql.SELECT("pay_status"); sql.SELECT("recharge_status"); @@ -305,6 +310,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("tp_refund_order_no = #{record.tpRefundOrderNo,jdbcType=VARCHAR}"); } + if (record.getRefundId() != null) { + sql.SET("refund_id = #{record.refundId,jdbcType=VARCHAR}"); + } + if (record.getRefundFee() != null) { sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}"); } @@ -362,6 +371,7 @@ public class OutRechargeOrderSqlProvider { 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_id = #{record.refundId,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}"); @@ -474,6 +484,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("tp_refund_order_no = #{tpRefundOrderNo,jdbcType=VARCHAR}"); } + if (record.getRefundId() != null) { + sql.SET("refund_id = #{refundId,jdbcType=VARCHAR}"); + } + if (record.getRefundFee() != null) { sql.SET("refund_fee = #{refundFee,jdbcType=DECIMAL}"); } 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 41c299ca..2d5a5e33 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java @@ -139,6 +139,11 @@ public class OutRechargeOrder implements Serializable { */ private String tpRefundOrderNo; + /** + * 第三方退款订单号 + */ + private String refundId; + /** * 退款金额 */ @@ -150,7 +155,7 @@ public class OutRechargeOrder implements Serializable { private Integer payStatus; /** - * 充值状态：201:充值中 202：充值成功 203：充值失败' + * 充值状态：201:充值中 202：充值成功 203：充值失败 204:未充值 */ private Integer rechargeStatus; @@ -362,6 +367,14 @@ public class OutRechargeOrder implements Serializable { this.tpRefundOrderNo = tpRefundOrderNo; } + public String getRefundId() { + return refundId; + } + + public void setRefundId(String refundId) { + this.refundId = refundId; + } + public BigDecimal getRefundFee() { return refundFee; } @@ -447,6 +460,7 @@ public class OutRechargeOrder implements Serializable { && (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.getRefundId() == null ? other.getRefundId() == null : this.getRefundId().equals(other.getRefundId())) && (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())) @@ -484,6 +498,7 @@ public class OutRechargeOrder implements Serializable { 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 + ((getRefundId() == null) ? 0 : getRefundId().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()); @@ -524,6 +539,7 @@ public class OutRechargeOrder implements Serializable { sb.append(", orderPrice=").append(orderPrice); sb.append(", refundTime=").append(refundTime); sb.append(", tpRefundOrderNo=").append(tpRefundOrderNo); + sb.append(", refundId=").append(refundId); sb.append(", refundFee=").append(refundFee); sb.append(", payStatus=").append(payStatus); sb.append(", rechargeStatus=").append(rechargeStatus); 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 effbb561..2eaa9baf 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java @@ -1716,6 +1716,76 @@ public class OutRechargeOrderExample { return (Criteria) this; } + public Criteria andRefundIdIsNull() { + addCriterion("refund_id is null"); + return (Criteria) this; + } + + public Criteria andRefundIdIsNotNull() { + addCriterion("refund_id is not null"); + return (Criteria) this; + } + + public Criteria andRefundIdEqualTo(String value) { + addCriterion("refund_id =", value, "refundId"); + return (Criteria) this; + } + + public Criteria andRefundIdNotEqualTo(String value) { + addCriterion("refund_id <>", value, "refundId"); + return (Criteria) this; + } + + public Criteria andRefundIdGreaterThan(String value) { + addCriterion("refund_id >", value, "refundId"); + return (Criteria) this; + } + + public Criteria andRefundIdGreaterThanOrEqualTo(String value) { + addCriterion("refund_id >=", value, "refundId"); + return (Criteria) this; + } + + public Criteria andRefundIdLessThan(String value) { + addCriterion("refund_id <", value, "refundId"); + return (Criteria) this; + } + + public Criteria andRefundIdLessThanOrEqualTo(String value) { + addCriterion("refund_id <=", value, "refundId"); + return (Criteria) this; + } + + public Criteria andRefundIdLike(String value) { + addCriterion("refund_id like", value, "refundId"); + return (Criteria) this; + } + + public Criteria andRefundIdNotLike(String value) { + addCriterion("refund_id not like", value, "refundId"); + return (Criteria) this; + } + + public Criteria andRefundIdIn(List values) { + addCriterion("refund_id in", values, "refundId"); + return (Criteria) this; + } + + public Criteria andRefundIdNotIn(List values) { + addCriterion("refund_id not in", values, "refundId"); + return (Criteria) this; + } + + public Criteria andRefundIdBetween(String value1, String value2) { + addCriterion("refund_id between", value1, value2, "refundId"); + return (Criteria) this; + } + + public Criteria andRefundIdNotBetween(String value1, String value2) { + addCriterion("refund_id not between", value1, value2, "refundId"); + return (Criteria) this; + } + public Criteria andRefundFeeIsNull() { addCriterion("refund_fee is null"); return (Criteria) this;