提交代码

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

@@ -51,7 +51,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
         "remarks, out_refund_no, ",
         "refund_time, refund_id, ",
         "refund_fee, agent_key, ",
-        "object_id)",
+        "object_id, Identification_code)",
         "values (#{orderNo,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ",
         "#{userName,jdbcType=VARCHAR}, #{userPhone,jdbcType=VARCHAR}, ",
         "#{rechargeModel,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, ",
@@ -64,7 +64,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
         "#{remarks,jdbcType=VARCHAR}, #{outRefundNo,jdbcType=VARCHAR}, ",
         "#{refundTime,jdbcType=TIMESTAMP}, #{refundId,jdbcType=VARCHAR}, ",
         "#{refundFee,jdbcType=DECIMAL}, #{agentKey,jdbcType=VARCHAR}, ",
-        "#{objectId,jdbcType=BIGINT})"
+        "#{objectId,jdbcType=INTEGER}, #{identificationCode,jdbcType=BIGINT})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(OutRechargeOrder record);
@@ -100,7 +100,8 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
         @Result(column="refund_id", property="refundId", jdbcType=JdbcType.VARCHAR),
         @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL),
         @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR),
-        @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT)
+        @Result(column="object_id", property="objectId", jdbcType=JdbcType.INTEGER),
+        @Result(column="Identification_code", property="identificationCode", jdbcType=JdbcType.BIGINT)
     })
     List<OutRechargeOrder> selectByExample(OutRechargeOrderExample example);
 
@@ -109,7 +110,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
         "id, order_no, user_id, user_name, user_phone, recharge_model, pay_type, pay_price, ",
         "order_price, pay_real_price, pay_serial_no, `status`, recharge_content, recharge_name, ",
         "id_card, create_timed, pay_time, cancel_time, finish_time, remarks, out_refund_no, ",
-        "refund_time, refund_id, refund_fee, agent_key, object_id",
+        "refund_time, refund_id, refund_fee, agent_key, object_id, Identification_code",
         "from out_recharge_order",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -139,7 +140,8 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
         @Result(column="refund_id", property="refundId", jdbcType=JdbcType.VARCHAR),
         @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL),
         @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR),
-        @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT)
+        @Result(column="object_id", property="objectId", jdbcType=JdbcType.INTEGER),
+        @Result(column="Identification_code", property="identificationCode", jdbcType=JdbcType.BIGINT)
     })
     OutRechargeOrder selectByPrimaryKey(Long id);
 
@@ -178,7 +180,8 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
           "refund_id = #{refundId,jdbcType=VARCHAR},",
           "refund_fee = #{refundFee,jdbcType=DECIMAL},",
           "agent_key = #{agentKey,jdbcType=VARCHAR},",
-          "object_id = #{objectId,jdbcType=BIGINT}",
+          "object_id = #{objectId,jdbcType=INTEGER},",
+          "Identification_code = #{identificationCode,jdbcType=BIGINT}",
         "where id = #{id,jdbcType=BIGINT}"
     })
     int updateByPrimaryKey(OutRechargeOrder record);

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

@@ -125,7 +125,11 @@ public class OutRechargeOrderSqlProvider {
         }
         
         if (record.getObjectId() != null) {
-            sql.VALUES("object_id", "#{objectId,jdbcType=BIGINT}");
+            sql.VALUES("object_id", "#{objectId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIdentificationCode() != null) {
+            sql.VALUES("Identification_code", "#{identificationCode,jdbcType=BIGINT}");
         }
         
         return sql.toString();
@@ -163,6 +167,7 @@ public class OutRechargeOrderSqlProvider {
         sql.SELECT("refund_fee");
         sql.SELECT("agent_key");
         sql.SELECT("object_id");
+        sql.SELECT("Identification_code");
         sql.FROM("out_recharge_order");
         applyWhere(sql, example, false);
         
@@ -281,7 +286,11 @@ public class OutRechargeOrderSqlProvider {
         }
         
         if (record.getObjectId() != null) {
-            sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}");
+            sql.SET("object_id = #{record.objectId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIdentificationCode() != null) {
+            sql.SET("Identification_code = #{record.identificationCode,jdbcType=BIGINT}");
         }
         
         applyWhere(sql, example, true);
@@ -317,7 +326,8 @@ public class OutRechargeOrderSqlProvider {
         sql.SET("refund_id = #{record.refundId,jdbcType=VARCHAR}");
         sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}");
         sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}");
-        sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}");
+        sql.SET("object_id = #{record.objectId,jdbcType=INTEGER}");
+        sql.SET("Identification_code = #{record.identificationCode,jdbcType=BIGINT}");
         
         OutRechargeOrderExample example = (OutRechargeOrderExample) parameter.get("example");
         applyWhere(sql, example, true);
@@ -425,7 +435,11 @@ public class OutRechargeOrderSqlProvider {
         }
         
         if (record.getObjectId() != null) {
-            sql.SET("object_id = #{objectId,jdbcType=BIGINT}");
+            sql.SET("object_id = #{objectId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getIdentificationCode() != null) {
+            sql.SET("Identification_code = #{identificationCode,jdbcType=BIGINT}");
         }
         
         sql.WHERE("id = #{id,jdbcType=BIGINT}");

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

@@ -45,7 +45,7 @@ public class OutRechargeOrder implements Serializable {
     private Integer rechargeModel;
 
     /**
-     * 1.微信
+     * 1.微信  2.工会卡  3.积分
      */
     private Integer payType;
 
@@ -139,10 +139,9 @@ public class OutRechargeOrder implements Serializable {
      */
     private String agentKey;
 
-    /**
-     * 商品订单
-     */
-    private Long objectId;
+    private Integer objectId;
+
+    private Long identificationCode;
 
     private static final long serialVersionUID = 1L;
 
@@ -346,14 +345,22 @@ public class OutRechargeOrder implements Serializable {
         this.agentKey = agentKey;
     }
 
-    public Long getObjectId() {
+    public Integer getObjectId() {
         return objectId;
     }
 
-    public void setObjectId(Long objectId) {
+    public void setObjectId(Integer objectId) {
         this.objectId = objectId;
     }
 
+    public Long getIdentificationCode() {
+        return identificationCode;
+    }
+
+    public void setIdentificationCode(Long identificationCode) {
+        this.identificationCode = identificationCode;
+    }
+
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -391,7 +398,8 @@ public class OutRechargeOrder implements Serializable {
             && (this.getRefundId() == null ? other.getRefundId() == null : this.getRefundId().equals(other.getRefundId()))
             && (this.getRefundFee() == null ? other.getRefundFee() == null : this.getRefundFee().equals(other.getRefundFee()))
             && (this.getAgentKey() == null ? other.getAgentKey() == null : this.getAgentKey().equals(other.getAgentKey()))
-            && (this.getObjectId() == null ? other.getObjectId() == null : this.getObjectId().equals(other.getObjectId()));
+            && (this.getObjectId() == null ? other.getObjectId() == null : this.getObjectId().equals(other.getObjectId()))
+            && (this.getIdentificationCode() == null ? other.getIdentificationCode() == null : this.getIdentificationCode().equals(other.getIdentificationCode()));
     }
 
     @Override
@@ -424,6 +432,7 @@ public class OutRechargeOrder implements Serializable {
         result = prime * result + ((getRefundFee() == null) ? 0 : getRefundFee().hashCode());
         result = prime * result + ((getAgentKey() == null) ? 0 : getAgentKey().hashCode());
         result = prime * result + ((getObjectId() == null) ? 0 : getObjectId().hashCode());
+        result = prime * result + ((getIdentificationCode() == null) ? 0 : getIdentificationCode().hashCode());
         return result;
     }
 
@@ -459,8 +468,9 @@ public class OutRechargeOrder implements Serializable {
         sb.append(", refundFee=").append(refundFee);
         sb.append(", agentKey=").append(agentKey);
         sb.append(", objectId=").append(objectId);
+        sb.append(", identificationCode=").append(identificationCode);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
     }
-}
+}

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

@@ -1746,55 +1746,115 @@ public class OutRechargeOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andObjectIdEqualTo(Long value) {
+        public Criteria andObjectIdEqualTo(Integer value) {
             addCriterion("object_id =", value, "objectId");
             return (Criteria) this;
         }
 
-        public Criteria andObjectIdNotEqualTo(Long value) {
+        public Criteria andObjectIdNotEqualTo(Integer value) {
             addCriterion("object_id <>", value, "objectId");
             return (Criteria) this;
         }
 
-        public Criteria andObjectIdGreaterThan(Long value) {
+        public Criteria andObjectIdGreaterThan(Integer value) {
             addCriterion("object_id >", value, "objectId");
             return (Criteria) this;
         }
 
-        public Criteria andObjectIdGreaterThanOrEqualTo(Long value) {
+        public Criteria andObjectIdGreaterThanOrEqualTo(Integer value) {
             addCriterion("object_id >=", value, "objectId");
             return (Criteria) this;
         }
 
-        public Criteria andObjectIdLessThan(Long value) {
+        public Criteria andObjectIdLessThan(Integer value) {
             addCriterion("object_id <", value, "objectId");
             return (Criteria) this;
         }
 
-        public Criteria andObjectIdLessThanOrEqualTo(Long value) {
+        public Criteria andObjectIdLessThanOrEqualTo(Integer value) {
             addCriterion("object_id <=", value, "objectId");
             return (Criteria) this;
         }
 
-        public Criteria andObjectIdIn(List<Long> values) {
+        public Criteria andObjectIdIn(List<Integer> values) {
             addCriterion("object_id in", values, "objectId");
             return (Criteria) this;
         }
 
-        public Criteria andObjectIdNotIn(List<Long> values) {
+        public Criteria andObjectIdNotIn(List<Integer> values) {
             addCriterion("object_id not in", values, "objectId");
             return (Criteria) this;
         }
 
-        public Criteria andObjectIdBetween(Long value1, Long value2) {
+        public Criteria andObjectIdBetween(Integer value1, Integer value2) {
             addCriterion("object_id between", value1, value2, "objectId");
             return (Criteria) this;
         }
 
-        public Criteria andObjectIdNotBetween(Long value1, Long value2) {
+        public Criteria andObjectIdNotBetween(Integer value1, Integer value2) {
             addCriterion("object_id not between", value1, value2, "objectId");
             return (Criteria) this;
         }
+
+        public Criteria andIdentificationCodeIsNull() {
+            addCriterion("Identification_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentificationCodeIsNotNull() {
+            addCriterion("Identification_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentificationCodeEqualTo(Long value) {
+            addCriterion("Identification_code =", value, "identificationCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentificationCodeNotEqualTo(Long value) {
+            addCriterion("Identification_code <>", value, "identificationCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentificationCodeGreaterThan(Long value) {
+            addCriterion("Identification_code >", value, "identificationCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentificationCodeGreaterThanOrEqualTo(Long value) {
+            addCriterion("Identification_code >=", value, "identificationCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentificationCodeLessThan(Long value) {
+            addCriterion("Identification_code <", value, "identificationCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentificationCodeLessThanOrEqualTo(Long value) {
+            addCriterion("Identification_code <=", value, "identificationCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentificationCodeIn(List<Long> values) {
+            addCriterion("Identification_code in", values, "identificationCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentificationCodeNotIn(List<Long> values) {
+            addCriterion("Identification_code not in", values, "identificationCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentificationCodeBetween(Long value1, Long value2) {
+            addCriterion("Identification_code between", value1, value2, "identificationCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentificationCodeNotBetween(Long value1, Long value2) {
+            addCriterion("Identification_code not between", value1, value2, "identificationCode");
+            return (Criteria) this;
+        }
     }
 
     /**