袁野 3 years ago
parent 9abdc47b83
commit bfc7b13cbc
  1. 17
      hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java
  2. 14
      hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java
  3. 16
      hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
  4. 70
      hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java

@ -55,8 +55,9 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
"order_price, refund_time, ", "order_price, refund_time, ",
"tp_refund_order_no, refund_id, ", "tp_refund_order_no, refund_id, ",
"refund_fee, company_id, ", "refund_fee, company_id, ",
"pay_status, recharge_status, ", "pay_status, merch_id, ",
"ext_1, ext_2, ext_3)", "recharge_status, ext_1, ",
"ext_2, ext_3)",
"values (#{rechargePrice,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, ", "values (#{rechargePrice,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, ",
"#{operatorName,jdbcType=VARCHAR}, #{operatorType,jdbcType=INTEGER}, ", "#{operatorName,jdbcType=VARCHAR}, #{operatorType,jdbcType=INTEGER}, ",
"#{orderNo,jdbcType=VARCHAR}, #{rechargeType,jdbcType=INTEGER}, ", "#{orderNo,jdbcType=VARCHAR}, #{rechargeType,jdbcType=INTEGER}, ",
@ -73,8 +74,9 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
"#{orderPrice,jdbcType=DECIMAL}, #{refundTime,jdbcType=TIMESTAMP}, ", "#{orderPrice,jdbcType=DECIMAL}, #{refundTime,jdbcType=TIMESTAMP}, ",
"#{tpRefundOrderNo,jdbcType=VARCHAR}, #{refundId,jdbcType=VARCHAR}, ", "#{tpRefundOrderNo,jdbcType=VARCHAR}, #{refundId,jdbcType=VARCHAR}, ",
"#{refundFee,jdbcType=DECIMAL}, #{companyId,jdbcType=BIGINT}, ", "#{refundFee,jdbcType=DECIMAL}, #{companyId,jdbcType=BIGINT}, ",
"#{payStatus,jdbcType=INTEGER}, #{rechargeStatus,jdbcType=INTEGER}, ", "#{payStatus,jdbcType=INTEGER}, #{merchId,jdbcType=VARCHAR}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" "#{rechargeStatus,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
}) })
@Options(useGeneratedKeys=true,keyProperty="id") @Options(useGeneratedKeys=true,keyProperty="id")
int insert(OutRechargeOrder record); int insert(OutRechargeOrder record);
@ -119,6 +121,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
@Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL), @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER),
@Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR),
@Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@ -133,8 +136,8 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
"recharge_content, pay_type, labor_union_card, integral_num, discount_deduction_price, ", "recharge_content, pay_type, labor_union_card, integral_num, discount_deduction_price, ",
"integral_deduction_price, pay_price, pay_real_price, pay_serial_no, create_timed, ", "integral_deduction_price, pay_price, pay_real_price, pay_serial_no, create_timed, ",
"pay_time, cancel_time, finish_time, out_refund_no, order_price, refund_time, ", "pay_time, cancel_time, finish_time, out_refund_no, order_price, refund_time, ",
"tp_refund_order_no, refund_id, refund_fee, company_id, pay_status, recharge_status, ", "tp_refund_order_no, refund_id, refund_fee, company_id, pay_status, merch_id, ",
"ext_1, ext_2, ext_3", "recharge_status, ext_1, ext_2, ext_3",
"from out_recharge_order", "from out_recharge_order",
"where id = #{id,jdbcType=BIGINT}" "where id = #{id,jdbcType=BIGINT}"
}) })
@ -173,6 +176,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
@Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL), @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER),
@Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR),
@Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@ -224,6 +228,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
"refund_fee = #{refundFee,jdbcType=DECIMAL},", "refund_fee = #{refundFee,jdbcType=DECIMAL},",
"company_id = #{companyId,jdbcType=BIGINT},", "company_id = #{companyId,jdbcType=BIGINT},",
"pay_status = #{payStatus,jdbcType=INTEGER},", "pay_status = #{payStatus,jdbcType=INTEGER},",
"merch_id = #{merchId,jdbcType=VARCHAR},",
"recharge_status = #{rechargeStatus,jdbcType=INTEGER},", "recharge_status = #{rechargeStatus,jdbcType=INTEGER},",
"ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_1 = #{ext1,jdbcType=VARCHAR},",
"ext_2 = #{ext2,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},",

@ -160,6 +160,10 @@ public class OutRechargeOrderSqlProvider {
sql.VALUES("pay_status", "#{payStatus,jdbcType=INTEGER}"); sql.VALUES("pay_status", "#{payStatus,jdbcType=INTEGER}");
} }
if (record.getMerchId() != null) {
sql.VALUES("merch_id", "#{merchId,jdbcType=VARCHAR}");
}
if (record.getRechargeStatus() != null) { if (record.getRechargeStatus() != null) {
sql.VALUES("recharge_status", "#{rechargeStatus,jdbcType=INTEGER}"); sql.VALUES("recharge_status", "#{rechargeStatus,jdbcType=INTEGER}");
} }
@ -219,6 +223,7 @@ public class OutRechargeOrderSqlProvider {
sql.SELECT("refund_fee"); sql.SELECT("refund_fee");
sql.SELECT("company_id"); sql.SELECT("company_id");
sql.SELECT("pay_status"); sql.SELECT("pay_status");
sql.SELECT("merch_id");
sql.SELECT("recharge_status"); sql.SELECT("recharge_status");
sql.SELECT("ext_1"); sql.SELECT("ext_1");
sql.SELECT("ext_2"); sql.SELECT("ext_2");
@ -376,6 +381,10 @@ public class OutRechargeOrderSqlProvider {
sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}");
} }
if (record.getMerchId() != null) {
sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}");
}
if (record.getRechargeStatus() != null) { if (record.getRechargeStatus() != null) {
sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}");
} }
@ -434,6 +443,7 @@ public class OutRechargeOrderSqlProvider {
sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}"); sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}");
sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}");
sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}");
sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
@ -580,6 +590,10 @@ public class OutRechargeOrderSqlProvider {
sql.SET("pay_status = #{payStatus,jdbcType=INTEGER}"); sql.SET("pay_status = #{payStatus,jdbcType=INTEGER}");
} }
if (record.getMerchId() != null) {
sql.SET("merch_id = #{merchId,jdbcType=VARCHAR}");
}
if (record.getRechargeStatus() != null) { if (record.getRechargeStatus() != null) {
sql.SET("recharge_status = #{rechargeStatus,jdbcType=INTEGER}"); sql.SET("recharge_status = #{rechargeStatus,jdbcType=INTEGER}");
} }

@ -184,6 +184,11 @@ public class OutRechargeOrder implements Serializable {
*/ */
private Integer payStatus; private Integer payStatus;
/**
* 商户号
*/
private String merchId;
/** /**
* 充值状态201:充值中 202充值成功 203充值失败 204:未充值 * 充值状态201:充值中 202充值成功 203充值失败 204:未充值
*/ */
@ -469,6 +474,14 @@ public class OutRechargeOrder implements Serializable {
this.payStatus = payStatus; this.payStatus = payStatus;
} }
public String getMerchId() {
return merchId;
}
public void setMerchId(String merchId) {
this.merchId = merchId;
}
public Integer getRechargeStatus() { public Integer getRechargeStatus() {
return rechargeStatus; return rechargeStatus;
} }
@ -547,6 +560,7 @@ public class OutRechargeOrder implements Serializable {
&& (this.getRefundFee() == null ? other.getRefundFee() == null : this.getRefundFee().equals(other.getRefundFee())) && (this.getRefundFee() == null ? other.getRefundFee() == null : this.getRefundFee().equals(other.getRefundFee()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus())) && (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus()))
&& (this.getMerchId() == null ? other.getMerchId() == null : this.getMerchId().equals(other.getMerchId()))
&& (this.getRechargeStatus() == null ? other.getRechargeStatus() == null : this.getRechargeStatus().equals(other.getRechargeStatus())) && (this.getRechargeStatus() == null ? other.getRechargeStatus() == null : this.getRechargeStatus().equals(other.getRechargeStatus()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
&& (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
@ -591,6 +605,7 @@ public class OutRechargeOrder implements Serializable {
result = prime * result + ((getRefundFee() == null) ? 0 : getRefundFee().hashCode()); result = prime * result + ((getRefundFee() == null) ? 0 : getRefundFee().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode()); result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode());
result = prime * result + ((getMerchId() == null) ? 0 : getMerchId().hashCode());
result = prime * result + ((getRechargeStatus() == null) ? 0 : getRechargeStatus().hashCode()); result = prime * result + ((getRechargeStatus() == null) ? 0 : getRechargeStatus().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
@ -638,6 +653,7 @@ public class OutRechargeOrder implements Serializable {
sb.append(", refundFee=").append(refundFee); sb.append(", refundFee=").append(refundFee);
sb.append(", companyId=").append(companyId); sb.append(", companyId=").append(companyId);
sb.append(", payStatus=").append(payStatus); sb.append(", payStatus=").append(payStatus);
sb.append(", merchId=").append(merchId);
sb.append(", rechargeStatus=").append(rechargeStatus); sb.append(", rechargeStatus=").append(rechargeStatus);
sb.append(", ext1=").append(ext1); sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2); sb.append(", ext2=").append(ext2);

@ -2276,6 +2276,76 @@ public class OutRechargeOrderExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMerchIdIsNull() {
addCriterion("merch_id is null");
return (Criteria) this;
}
public Criteria andMerchIdIsNotNull() {
addCriterion("merch_id is not null");
return (Criteria) this;
}
public Criteria andMerchIdEqualTo(String value) {
addCriterion("merch_id =", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdNotEqualTo(String value) {
addCriterion("merch_id <>", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdGreaterThan(String value) {
addCriterion("merch_id >", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdGreaterThanOrEqualTo(String value) {
addCriterion("merch_id >=", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdLessThan(String value) {
addCriterion("merch_id <", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdLessThanOrEqualTo(String value) {
addCriterion("merch_id <=", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdLike(String value) {
addCriterion("merch_id like", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdNotLike(String value) {
addCriterion("merch_id not like", value, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdIn(List<String> values) {
addCriterion("merch_id in", values, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdNotIn(List<String> values) {
addCriterion("merch_id not in", values, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdBetween(String value1, String value2) {
addCriterion("merch_id between", value1, value2, "merchId");
return (Criteria) this;
}
public Criteria andMerchIdNotBetween(String value1, String value2) {
addCriterion("merch_id not between", value1, value2, "merchId");
return (Criteria) this;
}
public Criteria andRechargeStatusIsNull() { public Criteria andRechargeStatusIsNull() {
addCriterion("recharge_status is null"); addCriterion("recharge_status is null");
return (Criteria) this; return (Criteria) this;

Loading…
Cancel
Save