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 d4281da2..ee5cca93 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java @@ -40,39 +40,39 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @Insert({ "insert into out_recharge_order (`type`, operator_name, ", - "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, ", - "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)", + "operator_type, 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, 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)", "values (#{type,jdbcType=INTEGER}, #{operatorName,jdbcType=VARCHAR}, ", - "#{orderNo,jdbcType=VARCHAR}, #{rechargeType,jdbcType=INTEGER}, ", - "#{memDiscountId,jdbcType=BIGINT}, #{memDiscountName,jdbcType=VARCHAR}, ", - "#{userId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, ", - "#{userPhone,jdbcType=VARCHAR}, #{goodsId,jdbcType=BIGINT}, ", - "#{rechargeContent,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", - "#{laborUnionCard,jdbcType=VARCHAR}, #{integralNum,jdbcType=BIGINT}, ", - "#{discountDeductionPrice,jdbcType=DECIMAL}, #{integralDeductionPrice,jdbcType=DECIMAL}, ", - "#{payRealPrice,jdbcType=DECIMAL}, #{paySerialNo,jdbcType=VARCHAR}, ", - "#{createTimed,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ", - "#{cancelTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ", - "#{outRefundNo,jdbcType=VARCHAR}, #{orderPrice,jdbcType=DECIMAL}, ", - "#{refundTime,jdbcType=TIMESTAMP}, #{tpRefundOrderNo,jdbcType=VARCHAR}, ", - "#{refundId,jdbcType=VARCHAR}, #{refundFee,jdbcType=DECIMAL}, ", - "#{regionId,jdbcType=VARCHAR}, #{payStatus,jdbcType=INTEGER}, ", - "#{rechargeStatus,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{operatorType,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, ", + "#{rechargeType,jdbcType=INTEGER}, #{memDiscountId,jdbcType=BIGINT}, ", + "#{memDiscountName,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ", + "#{userName,jdbcType=VARCHAR}, #{userPhone,jdbcType=VARCHAR}, ", + "#{goodsId,jdbcType=BIGINT}, #{rechargeContent,jdbcType=VARCHAR}, ", + "#{payType,jdbcType=INTEGER}, #{laborUnionCard,jdbcType=VARCHAR}, ", + "#{integralNum,jdbcType=BIGINT}, #{discountDeductionPrice,jdbcType=DECIMAL}, ", + "#{integralDeductionPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ", + "#{paySerialNo,jdbcType=VARCHAR}, #{createTimed,jdbcType=TIMESTAMP}, ", + "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ", + "#{finishTime,jdbcType=TIMESTAMP}, #{outRefundNo,jdbcType=VARCHAR}, ", + "#{orderPrice,jdbcType=DECIMAL}, #{refundTime,jdbcType=TIMESTAMP}, ", + "#{tpRefundOrderNo,jdbcType=VARCHAR}, #{refundId,jdbcType=VARCHAR}, ", + "#{refundFee,jdbcType=DECIMAL}, #{regionId,jdbcType=VARCHAR}, ", + "#{payStatus,jdbcType=INTEGER}, #{rechargeStatus,jdbcType=INTEGER}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(OutRechargeOrder record); @@ -86,6 +86,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR), + @Result(column="operator_type", property="operatorType", jdbcType=JdbcType.INTEGER), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER), @Result(column="mem_discount_id", property="memDiscountId", jdbcType=JdbcType.BIGINT), @@ -123,12 +124,12 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @Select({ "select", - "id, `type`, operator_name, 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, 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", + "id, `type`, operator_name, operator_type, 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, 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", "from out_recharge_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -136,6 +137,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR), + @Result(column="operator_type", property="operatorType", jdbcType=JdbcType.INTEGER), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER), @Result(column="mem_discount_id", property="memDiscountId", jdbcType=JdbcType.BIGINT), @@ -184,6 +186,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "update out_recharge_order", "set `type` = #{type,jdbcType=INTEGER},", "operator_name = #{operatorName,jdbcType=VARCHAR},", + "operator_type = #{operatorType,jdbcType=INTEGER},", "order_no = #{orderNo,jdbcType=VARCHAR},", "recharge_type = #{rechargeType,jdbcType=INTEGER},", "mem_discount_id = #{memDiscountId,jdbcType=BIGINT},", 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 fad8fcb6..4ccd7666 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java @@ -36,6 +36,10 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("operator_name", "#{operatorName,jdbcType=VARCHAR}"); } + if (record.getOperatorType() != null) { + sql.VALUES("operator_type", "#{operatorType,jdbcType=INTEGER}"); + } + if (record.getOrderNo() != null) { sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); } @@ -176,6 +180,7 @@ public class OutRechargeOrderSqlProvider { } sql.SELECT("`type`"); sql.SELECT("operator_name"); + sql.SELECT("operator_type"); sql.SELECT("order_no"); sql.SELECT("recharge_type"); sql.SELECT("mem_discount_id"); @@ -237,6 +242,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("operator_name = #{record.operatorName,jdbcType=VARCHAR}"); } + if (record.getOperatorType() != null) { + sql.SET("operator_type = #{record.operatorType,jdbcType=INTEGER}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); } @@ -376,6 +385,7 @@ public class OutRechargeOrderSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); sql.SET("operator_name = #{record.operatorName,jdbcType=VARCHAR}"); + sql.SET("operator_type = #{record.operatorType,jdbcType=INTEGER}"); sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}"); sql.SET("mem_discount_id = #{record.memDiscountId,jdbcType=BIGINT}"); @@ -426,6 +436,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("operator_name = #{operatorName,jdbcType=VARCHAR}"); } + if (record.getOperatorType() != null) { + sql.SET("operator_type = #{operatorType,jdbcType=INTEGER}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{orderNo,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 ed51a9cc..81228d46 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java @@ -29,6 +29,11 @@ public class OutRechargeOrder implements Serializable { */ private String operatorName; + /** + * 1:电信运营商 2:移动运营商 3:联通运营商 + */ + private Integer operatorType; + /** * 充值订单号 */ @@ -206,6 +211,14 @@ public class OutRechargeOrder implements Serializable { this.operatorName = operatorName; } + public Integer getOperatorType() { + return operatorType; + } + + public void setOperatorType(Integer operatorType) { + this.operatorType = operatorType; + } + public String getOrderNo() { return orderNo; } @@ -477,6 +490,7 @@ public class OutRechargeOrder implements Serializable { return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getOperatorName() == null ? other.getOperatorName() == null : this.getOperatorName().equals(other.getOperatorName())) + && (this.getOperatorType() == null ? other.getOperatorType() == null : this.getOperatorType().equals(other.getOperatorType())) && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) && (this.getRechargeType() == null ? other.getRechargeType() == null : this.getRechargeType().equals(other.getRechargeType())) && (this.getMemDiscountId() == null ? other.getMemDiscountId() == null : this.getMemDiscountId().equals(other.getMemDiscountId())) @@ -518,6 +532,7 @@ public class OutRechargeOrder implements Serializable { result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getOperatorName() == null) ? 0 : getOperatorName().hashCode()); + result = prime * result + ((getOperatorType() == null) ? 0 : getOperatorType().hashCode()); result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); result = prime * result + ((getRechargeType() == null) ? 0 : getRechargeType().hashCode()); result = prime * result + ((getMemDiscountId() == null) ? 0 : getMemDiscountId().hashCode()); @@ -562,6 +577,7 @@ public class OutRechargeOrder implements Serializable { sb.append(", id=").append(id); sb.append(", type=").append(type); sb.append(", operatorName=").append(operatorName); + sb.append(", operatorType=").append(operatorType); sb.append(", orderNo=").append(orderNo); sb.append(", rechargeType=").append(rechargeType); sb.append(", memDiscountId=").append(memDiscountId); 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 6fd6f5e9..f73ab4cb 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java @@ -316,6 +316,66 @@ public class OutRechargeOrderExample { return (Criteria) this; } + public Criteria andOperatorTypeIsNull() { + addCriterion("operator_type is null"); + return (Criteria) this; + } + + public Criteria andOperatorTypeIsNotNull() { + addCriterion("operator_type is not null"); + return (Criteria) this; + } + + public Criteria andOperatorTypeEqualTo(Integer value) { + addCriterion("operator_type =", value, "operatorType"); + return (Criteria) this; + } + + public Criteria andOperatorTypeNotEqualTo(Integer value) { + addCriterion("operator_type <>", value, "operatorType"); + return (Criteria) this; + } + + public Criteria andOperatorTypeGreaterThan(Integer value) { + addCriterion("operator_type >", value, "operatorType"); + return (Criteria) this; + } + + public Criteria andOperatorTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("operator_type >=", value, "operatorType"); + return (Criteria) this; + } + + public Criteria andOperatorTypeLessThan(Integer value) { + addCriterion("operator_type <", value, "operatorType"); + return (Criteria) this; + } + + public Criteria andOperatorTypeLessThanOrEqualTo(Integer value) { + addCriterion("operator_type <=", value, "operatorType"); + return (Criteria) this; + } + + public Criteria andOperatorTypeIn(List values) { + addCriterion("operator_type in", values, "operatorType"); + return (Criteria) this; + } + + public Criteria andOperatorTypeNotIn(List values) { + addCriterion("operator_type not in", values, "operatorType"); + return (Criteria) this; + } + + public Criteria andOperatorTypeBetween(Integer value1, Integer value2) { + addCriterion("operator_type between", value1, value2, "operatorType"); + return (Criteria) this; + } + + public Criteria andOperatorTypeNotBetween(Integer value1, Integer value2) { + addCriterion("operator_type not between", value1, value2, "operatorType"); + return (Criteria) this; + } + public Criteria andOrderNoIsNull() { addCriterion("order_no is null"); return (Criteria) this;