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 ee5cca93..db55d356 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java @@ -53,7 +53,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "finish_time, out_refund_no, ", "order_price, refund_time, ", "tp_refund_order_no, refund_id, ", - "refund_fee, region_id, ", + "refund_fee, company_id, ", "pay_status, recharge_status, ", "ext_1, ext_2, ext_3)", "values (#{type,jdbcType=INTEGER}, #{operatorName,jdbcType=VARCHAR}, ", @@ -70,7 +70,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "#{finishTime,jdbcType=TIMESTAMP}, #{outRefundNo,jdbcType=VARCHAR}, ", "#{orderPrice,jdbcType=DECIMAL}, #{refundTime,jdbcType=TIMESTAMP}, ", "#{tpRefundOrderNo,jdbcType=VARCHAR}, #{refundId,jdbcType=VARCHAR}, ", - "#{refundFee,jdbcType=DECIMAL}, #{regionId,jdbcType=VARCHAR}, ", + "#{refundFee,jdbcType=DECIMAL}, #{companyId,jdbcType=BIGINT}, ", "#{payStatus,jdbcType=INTEGER}, #{rechargeStatus,jdbcType=INTEGER}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @@ -113,7 +113,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @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="region_id", property="regionId", jdbcType=JdbcType.VARCHAR), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @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), @@ -129,7 +129,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "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_id, refund_fee, ", - "region_id, pay_status, recharge_status, ext_1, ext_2, ext_3", + "company_id, pay_status, recharge_status, ext_1, ext_2, ext_3", "from out_recharge_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -164,7 +164,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @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="region_id", property="regionId", jdbcType=JdbcType.VARCHAR), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @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), @@ -213,7 +213,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "tp_refund_order_no = #{tpRefundOrderNo,jdbcType=VARCHAR},", "refund_id = #{refundId,jdbcType=VARCHAR},", "refund_fee = #{refundFee,jdbcType=DECIMAL},", - "region_id = #{regionId,jdbcType=VARCHAR},", + "company_id = #{companyId,jdbcType=BIGINT},", "pay_status = #{payStatus,jdbcType=INTEGER},", "recharge_status = #{rechargeStatus,jdbcType=INTEGER},", "ext_1 = #{ext1,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 4ccd7666..5c46f614 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java @@ -144,8 +144,8 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("refund_fee", "#{refundFee,jdbcType=DECIMAL}"); } - if (record.getRegionId() != null) { - sql.VALUES("region_id", "#{regionId,jdbcType=VARCHAR}"); + if (record.getCompanyId() != null) { + sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}"); } if (record.getPayStatus() != null) { @@ -207,7 +207,7 @@ public class OutRechargeOrderSqlProvider { sql.SELECT("tp_refund_order_no"); sql.SELECT("refund_id"); sql.SELECT("refund_fee"); - sql.SELECT("region_id"); + sql.SELECT("company_id"); sql.SELECT("pay_status"); sql.SELECT("recharge_status"); sql.SELECT("ext_1"); @@ -350,8 +350,8 @@ public class OutRechargeOrderSqlProvider { sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}"); } - if (record.getRegionId() != null) { - sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}"); + if (record.getCompanyId() != null) { + sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); } if (record.getPayStatus() != null) { @@ -412,7 +412,7 @@ public class OutRechargeOrderSqlProvider { 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("region_id = #{record.regionId,jdbcType=VARCHAR}"); + sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); @@ -544,8 +544,8 @@ public class OutRechargeOrderSqlProvider { sql.SET("refund_fee = #{refundFee,jdbcType=DECIMAL}"); } - if (record.getRegionId() != null) { - sql.SET("region_id = #{regionId,jdbcType=VARCHAR}"); + if (record.getCompanyId() != null) { + sql.SET("company_id = #{companyId,jdbcType=BIGINT}"); } if (record.getPayStatus() != null) { 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 81228d46..454ed4bf 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java @@ -165,9 +165,9 @@ public class OutRechargeOrder implements Serializable { private BigDecimal refundFee; /** - * 区域编码 + * 公司id */ - private String regionId; + private Long companyId; /** * 订单支付状态 ： 101.待支付 102.已支付 100.已完成 104.已取消 105.已退款 @@ -427,12 +427,12 @@ public class OutRechargeOrder implements Serializable { this.refundFee = refundFee; } - public String getRegionId() { - return regionId; + public Long getCompanyId() { + return companyId; } - public void setRegionId(String regionId) { - this.regionId = regionId; + public void setCompanyId(Long companyId) { + this.companyId = companyId; } public Integer getPayStatus() { @@ -517,7 +517,7 @@ public class OutRechargeOrder implements Serializable { && (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.getRegionId() == null ? other.getRegionId() == null : this.getRegionId().equals(other.getRegionId())) + && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (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())) @@ -559,7 +559,7 @@ public class OutRechargeOrder implements Serializable { 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 + ((getRegionId() == null) ? 0 : getRegionId().hashCode()); + result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().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()); @@ -604,7 +604,7 @@ public class OutRechargeOrder implements Serializable { sb.append(", tpRefundOrderNo=").append(tpRefundOrderNo); sb.append(", refundId=").append(refundId); sb.append(", refundFee=").append(refundFee); - sb.append(", regionId=").append(regionId); + sb.append(", companyId=").append(companyId); sb.append(", payStatus=").append(payStatus); sb.append(", rechargeStatus=").append(rechargeStatus); sb.append(", ext1=").append(ext1); 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 f73ab4cb..3bf307d0 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java @@ -2036,73 +2036,63 @@ public class OutRechargeOrderExample { return (Criteria) this; } - public Criteria andRegionIdIsNull() { - addCriterion("region_id is null"); + public Criteria andCompanyIdIsNull() { + addCriterion("company_id is null"); return (Criteria) this; } - public Criteria andRegionIdIsNotNull() { - addCriterion("region_id is not null"); + public Criteria andCompanyIdIsNotNull() { + addCriterion("company_id is not null"); return (Criteria) this; } - public Criteria andRegionIdEqualTo(String value) { - addCriterion("region_id =", value, "regionId"); + public Criteria andCompanyIdEqualTo(Long value) { + addCriterion("company_id =", value, "companyId"); return (Criteria) this; } - public Criteria andRegionIdNotEqualTo(String value) { - addCriterion("region_id <>", value, "regionId"); + public Criteria andCompanyIdNotEqualTo(Long value) { + addCriterion("company_id <>", value, "companyId"); return (Criteria) this; } - public Criteria andRegionIdGreaterThan(String value) { - addCriterion("region_id >", value, "regionId"); + public Criteria andCompanyIdGreaterThan(Long value) { + addCriterion("company_id >", value, "companyId"); return (Criteria) this; } - public Criteria andRegionIdGreaterThanOrEqualTo(String value) { - addCriterion("region_id >=", value, "regionId"); + public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) { + addCriterion("company_id >=", value, "companyId"); return (Criteria) this; } - public Criteria andRegionIdLessThan(String value) { - addCriterion("region_id <", value, "regionId"); + public Criteria andCompanyIdLessThan(Long value) { + addCriterion("company_id <", value, "companyId"); return (Criteria) this; } - public Criteria andRegionIdLessThanOrEqualTo(String value) { - addCriterion("region_id <=", value, "regionId"); + public Criteria andCompanyIdLessThanOrEqualTo(Long value) { + addCriterion("company_id <=", value, "companyId"); return (Criteria) this; } - public Criteria andRegionIdLike(String value) { - addCriterion("region_id like", value, "regionId"); + public Criteria andCompanyIdIn(List values) { + addCriterion("company_id in", values, "companyId"); return (Criteria) this; } - public Criteria andRegionIdNotLike(String value) { - addCriterion("region_id not like", value, "regionId"); + public Criteria andCompanyIdNotIn(List values) { + addCriterion("company_id not in", values, "companyId"); return (Criteria) this; } - public Criteria andRegionIdIn(List values) { - addCriterion("region_id in", values, "regionId"); + public Criteria andCompanyIdBetween(Long value1, Long value2) { + addCriterion("company_id between", value1, value2, "companyId"); return (Criteria) this; } - public Criteria andRegionIdNotIn(List values) { - addCriterion("region_id not in", values, "regionId"); - return (Criteria) this; - } - - public Criteria andRegionIdBetween(String value1, String value2) { - addCriterion("region_id between", value1, value2, "regionId"); - return (Criteria) this; - } - - public Criteria andRegionIdNotBetween(String value1, String value2) { - addCriterion("region_id not between", value1, value2, "regionId"); + public Criteria andCompanyIdNotBetween(Long value1, Long value2) { + addCriterion("company_id not between", value1, value2, "companyId"); return (Criteria) this; }