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 c0797fdb..e4137911 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java @@ -48,7 +48,8 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "recharge_name, id_card, ", "create_timed, pay_time, ", "cancel_time, finish_time, ", - "remarks)", + "remarks, out_refund_no, ", + "refund_fee)", "values (#{orderNo,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ", "#{userName,jdbcType=VARCHAR}, #{userPhone,jdbcType=VARCHAR}, ", "#{rechargeModel,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, ", @@ -58,7 +59,8 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "#{rechargeName,jdbcType=VARCHAR}, #{idCard,jdbcType=VARCHAR}, ", "#{createTimed,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ", "#{cancelTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ", - "#{remarks,jdbcType=VARCHAR})" + "#{remarks,jdbcType=VARCHAR}, #{outRefundNo,jdbcType=VARCHAR}, ", + "#{refundFee,jdbcType=DECIMAL})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(OutRechargeOrder record); @@ -88,7 +90,9 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @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="remarks", property="remarks", jdbcType=JdbcType.VARCHAR) + @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), + @Result(column="out_refund_no", property="outRefundNo", jdbcType=JdbcType.VARCHAR), + @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL) }) List selectByExample(OutRechargeOrderExample example); @@ -96,7 +100,8 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "select", "id, order_no, user_id, user_name, user_phone, recharge_model, pay_type, pay_price, ", "order_price, pay_real_price, pay_serial_no, `status`, recharge_content, recharge_name, ", - "id_card, create_timed, pay_time, cancel_time, finish_time, remarks", + "id_card, create_timed, pay_time, cancel_time, finish_time, remarks, out_refund_no, ", + "refund_fee", "from out_recharge_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -120,7 +125,9 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @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="remarks", property="remarks", jdbcType=JdbcType.VARCHAR) + @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), + @Result(column="out_refund_no", property="outRefundNo", jdbcType=JdbcType.VARCHAR), + @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL) }) OutRechargeOrder selectByPrimaryKey(Long id); @@ -153,7 +160,9 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "pay_time = #{payTime,jdbcType=TIMESTAMP},", "cancel_time = #{cancelTime,jdbcType=TIMESTAMP},", "finish_time = #{finishTime,jdbcType=TIMESTAMP},", - "remarks = #{remarks,jdbcType=VARCHAR}", + "remarks = #{remarks,jdbcType=VARCHAR},", + "out_refund_no = #{outRefundNo,jdbcType=VARCHAR},", + "refund_fee = #{refundFee,jdbcType=DECIMAL}", "where id = #{id,jdbcType=BIGINT}" }) int updateByPrimaryKey(OutRechargeOrder record); 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 9081bf00..6283b67c 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java @@ -104,6 +104,14 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("remarks", "#{remarks,jdbcType=VARCHAR}"); } + if (record.getOutRefundNo() != null) { + sql.VALUES("out_refund_no", "#{outRefundNo,jdbcType=VARCHAR}"); + } + + if (record.getRefundFee() != null) { + sql.VALUES("refund_fee", "#{refundFee,jdbcType=DECIMAL}"); + } + return sql.toString(); } @@ -133,6 +141,8 @@ public class OutRechargeOrderSqlProvider { sql.SELECT("cancel_time"); sql.SELECT("finish_time"); sql.SELECT("remarks"); + sql.SELECT("out_refund_no"); + sql.SELECT("refund_fee"); sql.FROM("out_recharge_order"); applyWhere(sql, example, false); @@ -230,6 +240,14 @@ public class OutRechargeOrderSqlProvider { sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); } + if (record.getOutRefundNo() != null) { + sql.SET("out_refund_no = #{record.outRefundNo,jdbcType=VARCHAR}"); + } + + if (record.getRefundFee() != null) { + sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}"); + } + applyWhere(sql, example, true); return sql.toString(); } @@ -258,6 +276,8 @@ public class OutRechargeOrderSqlProvider { sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}"); sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); + sql.SET("out_refund_no = #{record.outRefundNo,jdbcType=VARCHAR}"); + sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}"); OutRechargeOrderExample example = (OutRechargeOrderExample) parameter.get("example"); applyWhere(sql, example, true); @@ -344,6 +364,14 @@ public class OutRechargeOrderSqlProvider { sql.SET("remarks = #{remarks,jdbcType=VARCHAR}"); } + if (record.getOutRefundNo() != null) { + sql.SET("out_refund_no = #{outRefundNo,jdbcType=VARCHAR}"); + } + + if (record.getRefundFee() != null) { + sql.SET("refund_fee = #{refundFee,jdbcType=DECIMAL}"); + } + sql.WHERE("id = #{id,jdbcType=BIGINT}"); return sql.toString(); 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 f79c47b7..a0a79cc7 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java @@ -108,8 +108,21 @@ public class OutRechargeOrder implements Serializable { */ private Date finishTime; + /** + * 备注 + */ private String remarks; + /** + * 退款订单号 + */ + private String outRefundNo; + + /** + * 退款金额 + */ + private Long refundFee; + private static final long serialVersionUID = 1L; public Long getId() { @@ -272,6 +285,22 @@ public class OutRechargeOrder implements Serializable { this.remarks = remarks; } + public String getOutRefundNo() { + return outRefundNo; + } + + public void setOutRefundNo(String outRefundNo) { + this.outRefundNo = outRefundNo; + } + + public Long getRefundFee() { + return refundFee; + } + + public void setRefundFee(Long refundFee) { + this.refundFee = refundFee; + } + @Override public boolean equals(Object that) { if (this == that) { @@ -303,7 +332,9 @@ public class OutRechargeOrder implements Serializable { && (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.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks())); + && (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks())) + && (this.getOutRefundNo() == null ? other.getOutRefundNo() == null : this.getOutRefundNo().equals(other.getOutRefundNo())) + && (this.getRefundFee() == null ? other.getRefundFee() == null : this.getRefundFee().equals(other.getRefundFee())); } @Override @@ -330,6 +361,8 @@ public class OutRechargeOrder implements Serializable { result = prime * result + ((getCancelTime() == null) ? 0 : getCancelTime().hashCode()); result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode()); result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode()); + result = prime * result + ((getOutRefundNo() == null) ? 0 : getOutRefundNo().hashCode()); + result = prime * result + ((getRefundFee() == null) ? 0 : getRefundFee().hashCode()); return result; } @@ -359,6 +392,8 @@ public class OutRechargeOrder implements Serializable { sb.append(", cancelTime=").append(cancelTime); sb.append(", finishTime=").append(finishTime); sb.append(", remarks=").append(remarks); + sb.append(", outRefundNo=").append(outRefundNo); + sb.append(", refundFee=").append(refundFee); sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); return sb.toString(); 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 7aadceb3..71df992a 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java @@ -1404,6 +1404,136 @@ public class OutRechargeOrderExample { addCriterion("remarks not between", value1, value2, "remarks"); return (Criteria) this; } + + public Criteria andOutRefundNoIsNull() { + addCriterion("out_refund_no is null"); + return (Criteria) this; + } + + public Criteria andOutRefundNoIsNotNull() { + addCriterion("out_refund_no is not null"); + return (Criteria) this; + } + + public Criteria andOutRefundNoEqualTo(String value) { + addCriterion("out_refund_no =", value, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoNotEqualTo(String value) { + addCriterion("out_refund_no <>", value, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoGreaterThan(String value) { + addCriterion("out_refund_no >", value, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoGreaterThanOrEqualTo(String value) { + addCriterion("out_refund_no >=", value, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoLessThan(String value) { + addCriterion("out_refund_no <", value, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoLessThanOrEqualTo(String value) { + addCriterion("out_refund_no <=", value, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoLike(String value) { + addCriterion("out_refund_no like", value, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoNotLike(String value) { + addCriterion("out_refund_no not like", value, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoIn(List values) { + addCriterion("out_refund_no in", values, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoNotIn(List values) { + addCriterion("out_refund_no not in", values, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoBetween(String value1, String value2) { + addCriterion("out_refund_no between", value1, value2, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoNotBetween(String value1, String value2) { + addCriterion("out_refund_no not between", value1, value2, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andRefundFeeIsNull() { + addCriterion("refund_fee is null"); + return (Criteria) this; + } + + public Criteria andRefundFeeIsNotNull() { + addCriterion("refund_fee is not null"); + return (Criteria) this; + } + + public Criteria andRefundFeeEqualTo(Long value) { + addCriterion("refund_fee =", value, "refundFee"); + return (Criteria) this; + } + + public Criteria andRefundFeeNotEqualTo(Long value) { + addCriterion("refund_fee <>", value, "refundFee"); + return (Criteria) this; + } + + public Criteria andRefundFeeGreaterThan(Long value) { + addCriterion("refund_fee >", value, "refundFee"); + return (Criteria) this; + } + + public Criteria andRefundFeeGreaterThanOrEqualTo(Long value) { + addCriterion("refund_fee >=", value, "refundFee"); + return (Criteria) this; + } + + public Criteria andRefundFeeLessThan(Long value) { + addCriterion("refund_fee <", value, "refundFee"); + return (Criteria) this; + } + + public Criteria andRefundFeeLessThanOrEqualTo(Long value) { + addCriterion("refund_fee <=", value, "refundFee"); + return (Criteria) this; + } + + public Criteria andRefundFeeIn(List values) { + addCriterion("refund_fee in", values, "refundFee"); + return (Criteria) this; + } + + public Criteria andRefundFeeNotIn(List values) { + addCriterion("refund_fee not in", values, "refundFee"); + return (Criteria) this; + } + + public Criteria andRefundFeeBetween(Long value1, Long value2) { + addCriterion("refund_fee between", value1, value2, "refundFee"); + return (Criteria) this; + } + + public Criteria andRefundFeeNotBetween(Long value1, Long value2) { + addCriterion("refund_fee not between", value1, value2, "refundFee"); + return (Criteria) this; + } } /**