1

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

@@ -52,8 +52,9 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
         "out_refund_no, order_price, ",
         "refund_time, tp_refund_order_no, ",
         "refund_id, refund_fee, ",
-        "pay_status, recharge_status, ",
+        "region_id, pay_status, ",
-        "ext_1, ext_2, ext_3)",
+        "recharge_status, ext_1, ",
+        "ext_2, ext_3)",
         "values (#{orderNo,jdbcType=VARCHAR}, #{rechargeType,jdbcType=INTEGER}, ",
         "#{memDiscountId,jdbcType=BIGINT}, #{memDiscountName,jdbcType=VARCHAR}, ",
         "#{userId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, ",
@@ -67,8 +68,9 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
         "#{outRefundNo,jdbcType=VARCHAR}, #{orderPrice,jdbcType=DECIMAL}, ",
         "#{refundTime,jdbcType=TIMESTAMP}, #{tpRefundOrderNo,jdbcType=VARCHAR}, ",
         "#{refundId,jdbcType=VARCHAR}, #{refundFee,jdbcType=DECIMAL}, ",
-        "#{payStatus,jdbcType=INTEGER}, #{rechargeStatus,jdbcType=INTEGER}, ",
+        "#{regionId,jdbcType=VARCHAR}, #{payStatus,jdbcType=INTEGER}, ",
-        "#{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")
     int insert(OutRechargeOrder record);
@@ -106,6 +108,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="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),
@@ -120,8 +123,8 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
         "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, pay_status, recharge_status, ",
+        "refund_time, tp_refund_order_no, refund_id, refund_fee, region_id, pay_status, ",
-        "ext_1, ext_2, ext_3",
+        "recharge_status, ext_1, ext_2, ext_3",
         "from out_recharge_order",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -153,6 +156,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="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),
@@ -198,6 +202,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},",
           "pay_status = #{payStatus,jdbcType=INTEGER},",
           "recharge_status = #{rechargeStatus,jdbcType=INTEGER},",
           "ext_1 = #{ext1,jdbcType=VARCHAR},",

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

@@ -132,6 +132,10 @@ public class OutRechargeOrderSqlProvider {
             sql.VALUES("refund_fee", "#{refundFee,jdbcType=DECIMAL}");
         }
         
+        if (record.getRegionId() != null) {
+            sql.VALUES("region_id", "#{regionId,jdbcType=VARCHAR}");
+        }
+        
         if (record.getPayStatus() != null) {
             sql.VALUES("pay_status", "#{payStatus,jdbcType=INTEGER}");
         }
@@ -188,6 +192,7 @@ public class OutRechargeOrderSqlProvider {
         sql.SELECT("tp_refund_order_no");
         sql.SELECT("refund_id");
         sql.SELECT("refund_fee");
+        sql.SELECT("region_id");
         sql.SELECT("pay_status");
         sql.SELECT("recharge_status");
         sql.SELECT("ext_1");
@@ -318,6 +323,10 @@ 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.getPayStatus() != null) {
             sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}");
         }
@@ -373,6 +382,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("pay_status = #{record.payStatus,jdbcType=INTEGER}");
         sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}");
         sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
@@ -492,6 +502,10 @@ public class OutRechargeOrderSqlProvider {
             sql.SET("refund_fee = #{refundFee,jdbcType=DECIMAL}");
         }
         
+        if (record.getRegionId() != null) {
+            sql.SET("region_id = #{regionId,jdbcType=VARCHAR}");
+        }
+        
         if (record.getPayStatus() != null) {
             sql.SET("pay_status = #{payStatus,jdbcType=INTEGER}");
         }

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

@@ -149,6 +149,11 @@ public class OutRechargeOrder implements Serializable {
      */
     private BigDecimal refundFee;
 
+    /**
+     * 区域编码
+     */
+    private String regionId;
+
     /**
      * 订单支付状态 ： 101.待支付 102.已支付 100.已完成 104.已取消 105.已退款
      */
@@ -383,6 +388,14 @@ public class OutRechargeOrder implements Serializable {
         this.refundFee = refundFee;
     }
 
+    public String getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(String regionId) {
+        this.regionId = regionId;
+    }
+
     public Integer getPayStatus() {
         return payStatus;
     }
@@ -462,6 +475,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.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()))
@@ -500,6 +514,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 + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode());
         result = prime * result + ((getRechargeStatus() == null) ? 0 : getRechargeStatus().hashCode());
         result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
@@ -541,6 +556,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(", payStatus=").append(payStatus);
         sb.append(", rechargeStatus=").append(rechargeStatus);
         sb.append(", ext1=").append(ext1);

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

@@ -1846,6 +1846,76 @@ public class OutRechargeOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andRegionIdIsNull() {
+            addCriterion("region_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionIdIsNotNull() {
+            addCriterion("region_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionIdEqualTo(String value) {
+            addCriterion("region_id =", value, "regionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionIdNotEqualTo(String value) {
+            addCriterion("region_id <>", value, "regionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionIdGreaterThan(String value) {
+            addCriterion("region_id >", value, "regionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionIdGreaterThanOrEqualTo(String value) {
+            addCriterion("region_id >=", value, "regionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionIdLessThan(String value) {
+            addCriterion("region_id <", value, "regionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionIdLessThanOrEqualTo(String value) {
+            addCriterion("region_id <=", value, "regionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionIdLike(String value) {
+            addCriterion("region_id like", value, "regionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionIdNotLike(String value) {
+            addCriterion("region_id not like", value, "regionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionIdIn(List<String> values) {
+            addCriterion("region_id in", values, "regionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionIdNotIn(List<String> 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");
+            return (Criteria) this;
+        }
+
         public Criteria andPayStatusIsNull() {
             addCriterion("pay_status is null");
             return (Criteria) this;