1

hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java

@@ -39,34 +39,34 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
     int deleteByPrimaryKey(Long id);
 
     @Insert({
-        "insert into out_recharge_order (order_no, mem_discount_id, ",
+        "insert into out_recharge_order (order_no, recharge_type, ",
-        "mem_discount_name, user_id, ",
+        "mem_discount_id, mem_discount_name, ",
-        "user_name, user_phone, ",
+        "user_id, user_name, ",
-        "goods_id, recharge_content, ",
+        "user_phone, goods_id, ",
-        "pay_type, labor_union_card, ",
+        "recharge_content, pay_type, ",
-        "integral_num, discount_deduction_price, ",
+        "labor_union_card, integral_num, ",
-        "integral_deduction_price, pay_real_price, ",
+        "discount_deduction_price, integral_deduction_price, ",
-        "pay_serial_no, pay_status, ",
+        "pay_real_price, pay_serial_no, ",
-        "recharge_status, create_timed, ",
+        "pay_status, recharge_status, ",
-        "pay_time, cancel_time, ",
+        "create_timed, pay_time, ",
-        "finish_time, out_refund_no, ",
+        "cancel_time, finish_time, ",
-        "refund_time, tp_refund_order_no, ",
+        "out_refund_no, refund_time, ",
-        "refund_fee, ext_1, ",
+        "tp_refund_order_no, refund_fee, ",
-        "ext_2, ext_3)",
+        "ext_1, ext_2, ext_3)",
-        "values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ",
+        "values (#{orderNo,jdbcType=VARCHAR}, #{rechargeType,jdbcType=INTEGER}, ",
-        "#{memDiscountName,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ",
+        "#{memDiscountId,jdbcType=BIGINT}, #{memDiscountName,jdbcType=VARCHAR}, ",
-        "#{userName,jdbcType=VARCHAR}, #{userPhone,jdbcType=VARCHAR}, ",
+        "#{userId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, ",
-        "#{goodsId,jdbcType=BIGINT}, #{rechargeContent,jdbcType=VARCHAR}, ",
+        "#{userPhone,jdbcType=VARCHAR}, #{goodsId,jdbcType=BIGINT}, ",
-        "#{payType,jdbcType=INTEGER}, #{laborUnionCard,jdbcType=VARCHAR}, ",
+        "#{rechargeContent,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ",
-        "#{integralNum,jdbcType=BIGINT}, #{discountDeductionPrice,jdbcType=DECIMAL}, ",
+        "#{laborUnionCard,jdbcType=VARCHAR}, #{integralNum,jdbcType=BIGINT}, ",
-        "#{integralDeductionPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ",
+        "#{discountDeductionPrice,jdbcType=DECIMAL}, #{integralDeductionPrice,jdbcType=DECIMAL}, ",
-        "#{paySerialNo,jdbcType=VARCHAR}, #{payStatus,jdbcType=INTEGER}, ",
+        "#{payRealPrice,jdbcType=DECIMAL}, #{paySerialNo,jdbcType=VARCHAR}, ",
-        "#{rechargeStatus,jdbcType=INTEGER}, #{createTimed,jdbcType=TIMESTAMP}, ",
+        "#{payStatus,jdbcType=INTEGER}, #{rechargeStatus,jdbcType=INTEGER}, ",
-        "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ",
+        "#{createTimed,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ",
-        "#{finishTime,jdbcType=TIMESTAMP}, #{outRefundNo,jdbcType=VARCHAR}, ",
+        "#{cancelTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ",
-        "#{refundTime,jdbcType=TIMESTAMP}, #{tpRefundOrderNo,jdbcType=VARCHAR}, ",
+        "#{outRefundNo,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, ",
-        "#{refundFee,jdbcType=DECIMAL}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{tpRefundOrderNo,jdbcType=VARCHAR}, #{refundFee,jdbcType=DECIMAL}, ",
-        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(OutRechargeOrder record);
@@ -79,6 +79,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @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),
         @Result(column="mem_discount_name", property="memDiscountName", jdbcType=JdbcType.VARCHAR),
         @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
@@ -111,17 +112,18 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
 
     @Select({
         "select",
-        "id, order_no, mem_discount_id, mem_discount_name, user_id, user_name, user_phone, ",
+        "id, order_no, recharge_type, mem_discount_id, mem_discount_name, user_id, user_name, ",
-        "goods_id, recharge_content, pay_type, labor_union_card, integral_num, discount_deduction_price, ",
+        "user_phone, goods_id, recharge_content, pay_type, labor_union_card, integral_num, ",
-        "integral_deduction_price, pay_real_price, pay_serial_no, pay_status, recharge_status, ",
+        "discount_deduction_price, integral_deduction_price, pay_real_price, pay_serial_no, ",
-        "create_timed, pay_time, cancel_time, finish_time, out_refund_no, refund_time, ",
+        "pay_status, recharge_status, create_timed, pay_time, cancel_time, finish_time, ",
-        "tp_refund_order_no, refund_fee, ext_1, ext_2, ext_3",
+        "out_refund_no, refund_time, tp_refund_order_no, refund_fee, ext_1, ext_2, ext_3",
         "from out_recharge_order",
         "where id = #{id,jdbcType=BIGINT}"
     })
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @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),
         @Result(column="mem_discount_name", property="memDiscountName", jdbcType=JdbcType.VARCHAR),
         @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
@@ -164,6 +166,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
     @Update({
         "update out_recharge_order",
         "set order_no = #{orderNo,jdbcType=VARCHAR},",
+          "recharge_type = #{rechargeType,jdbcType=INTEGER},",
           "mem_discount_id = #{memDiscountId,jdbcType=BIGINT},",
           "mem_discount_name = #{memDiscountName,jdbcType=VARCHAR},",
           "user_id = #{userId,jdbcType=BIGINT},",

hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java

@@ -32,6 +32,10 @@ public class OutRechargeOrderSqlProvider {
             sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getRechargeType() != null) {
+            sql.VALUES("recharge_type", "#{rechargeType,jdbcType=INTEGER}");
+        }
+        
         if (record.getMemDiscountId() != null) {
             sql.VALUES("mem_discount_id", "#{memDiscountId,jdbcType=BIGINT}");
         }
@@ -151,6 +155,7 @@ public class OutRechargeOrderSqlProvider {
             sql.SELECT("id");
         }
         sql.SELECT("order_no");
+        sql.SELECT("recharge_type");
         sql.SELECT("mem_discount_id");
         sql.SELECT("mem_discount_name");
         sql.SELECT("user_id");
@@ -203,6 +208,10 @@ public class OutRechargeOrderSqlProvider {
             sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getRechargeType() != null) {
+            sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}");
+        }
+        
         if (record.getMemDiscountId() != null) {
             sql.SET("mem_discount_id = #{record.memDiscountId,jdbcType=BIGINT}");
         }
@@ -321,6 +330,7 @@ public class OutRechargeOrderSqlProvider {
         
         sql.SET("id = #{record.id,jdbcType=BIGINT}");
         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}");
         sql.SET("mem_discount_name = #{record.memDiscountName,jdbcType=VARCHAR}");
         sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
@@ -362,6 +372,10 @@ public class OutRechargeOrderSqlProvider {
             sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getRechargeType() != null) {
+            sql.SET("recharge_type = #{rechargeType,jdbcType=INTEGER}");
+        }
+        
         if (record.getMemDiscountId() != null) {
             sql.SET("mem_discount_id = #{memDiscountId,jdbcType=BIGINT}");
         }

hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java

@@ -24,6 +24,11 @@ public class OutRechargeOrder implements Serializable {
      */
     private String orderNo;
 
+    /**
+     * 1:快充 2：慢充
+     */
+    private Integer rechargeType;
+
     /**
      * 用户的优惠券high_discount_user_rel表的id
      */
@@ -168,6 +173,14 @@ public class OutRechargeOrder implements Serializable {
         this.orderNo = orderNo;
     }
 
+    public Integer getRechargeType() {
+        return rechargeType;
+    }
+
+    public void setRechargeType(Integer rechargeType) {
+        this.rechargeType = rechargeType;
+    }
+
     public Long getMemDiscountId() {
         return memDiscountId;
     }
@@ -398,6 +411,7 @@ public class OutRechargeOrder implements Serializable {
         OutRechargeOrder other = (OutRechargeOrder) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
             && (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()))
             && (this.getMemDiscountName() == null ? other.getMemDiscountName() == null : this.getMemDiscountName().equals(other.getMemDiscountName()))
             && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
@@ -433,6 +447,7 @@ public class OutRechargeOrder implements Serializable {
         int result = 1;
         result = prime * result + ((getId() == null) ? 0 : getId().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());
         result = prime * result + ((getMemDiscountName() == null) ? 0 : getMemDiscountName().hashCode());
         result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
@@ -471,6 +486,7 @@ public class OutRechargeOrder implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", orderNo=").append(orderNo);
+        sb.append(", rechargeType=").append(rechargeType);
         sb.append(", memDiscountId=").append(memDiscountId);
         sb.append(", memDiscountName=").append(memDiscountName);
         sb.append(", userId=").append(userId);

hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java

@@ -256,6 +256,66 @@ public class OutRechargeOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andRechargeTypeIsNull() {
+            addCriterion("recharge_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeIsNotNull() {
+            addCriterion("recharge_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeEqualTo(Integer value) {
+            addCriterion("recharge_type =", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeNotEqualTo(Integer value) {
+            addCriterion("recharge_type <>", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeGreaterThan(Integer value) {
+            addCriterion("recharge_type >", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("recharge_type >=", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeLessThan(Integer value) {
+            addCriterion("recharge_type <", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("recharge_type <=", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeIn(List<Integer> values) {
+            addCriterion("recharge_type in", values, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeNotIn(List<Integer> values) {
+            addCriterion("recharge_type not in", values, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeBetween(Integer value1, Integer value2) {
+            addCriterion("recharge_type between", value1, value2, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("recharge_type not between", value1, value2, "rechargeType");
+            return (Criteria) this;
+        }
+
         public Criteria andMemDiscountIdIsNull() {
             addCriterion("mem_discount_id is null");
             return (Criteria) this;