提交代码

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

@@ -40,11 +40,13 @@ public interface HighDiscountPackageDiscountActualMapper extends HighDiscountPac
 
     @Insert({
         "insert into high_discount_package_discount_actual (agent_discount_code_id, discount_package_id, ",
-        "discount_package_actual_id, created_user_id, ",
+        "discount_package_actual_id, agent_id, ",
+        "discount_id, created_user_id, ",
         "created_time, `status`, ",
         "ext_1, ext_2, ext_3)",
         "values (#{agentDiscountCodeId,jdbcType=BIGINT}, #{discountPackageId,jdbcType=INTEGER}, ",
-        "#{discountPackageActualId,jdbcType=INTEGER}, #{createdUserId,jdbcType=INTEGER}, ",
+        "#{discountPackageActualId,jdbcType=INTEGER}, #{agentId,jdbcType=BIGINT}, ",
+        "#{discountId,jdbcType=BIGINT}, #{createdUserId,jdbcType=INTEGER}, ",
         "#{createdTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ",
         "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
@@ -61,6 +63,8 @@ public interface HighDiscountPackageDiscountActualMapper extends HighDiscountPac
         @Result(column="agent_discount_code_id", property="agentDiscountCodeId", jdbcType=JdbcType.BIGINT),
         @Result(column="discount_package_id", property="discountPackageId", jdbcType=JdbcType.INTEGER),
         @Result(column="discount_package_actual_id", property="discountPackageActualId", jdbcType=JdbcType.INTEGER),
+        @Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT),
+        @Result(column="discount_id", property="discountId", jdbcType=JdbcType.BIGINT),
         @Result(column="created_user_id", property="createdUserId", jdbcType=JdbcType.INTEGER),
         @Result(column="created_time", property="createdTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@@ -73,7 +77,8 @@ public interface HighDiscountPackageDiscountActualMapper extends HighDiscountPac
     @Select({
         "select",
         "id, agent_discount_code_id, discount_package_id, discount_package_actual_id, ",
-        "created_user_id, created_time, `status`, ext_1, ext_2, ext_3",
+        "agent_id, discount_id, created_user_id, created_time, `status`, ext_1, ext_2, ",
+        "ext_3",
         "from high_discount_package_discount_actual",
         "where id = #{id,jdbcType=INTEGER}"
     })
@@ -82,6 +87,8 @@ public interface HighDiscountPackageDiscountActualMapper extends HighDiscountPac
         @Result(column="agent_discount_code_id", property="agentDiscountCodeId", jdbcType=JdbcType.BIGINT),
         @Result(column="discount_package_id", property="discountPackageId", jdbcType=JdbcType.INTEGER),
         @Result(column="discount_package_actual_id", property="discountPackageActualId", jdbcType=JdbcType.INTEGER),
+        @Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT),
+        @Result(column="discount_id", property="discountId", jdbcType=JdbcType.BIGINT),
         @Result(column="created_user_id", property="createdUserId", jdbcType=JdbcType.INTEGER),
         @Result(column="created_time", property="createdTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@@ -105,6 +112,8 @@ public interface HighDiscountPackageDiscountActualMapper extends HighDiscountPac
         "set agent_discount_code_id = #{agentDiscountCodeId,jdbcType=BIGINT},",
           "discount_package_id = #{discountPackageId,jdbcType=INTEGER},",
           "discount_package_actual_id = #{discountPackageActualId,jdbcType=INTEGER},",
+          "agent_id = #{agentId,jdbcType=BIGINT},",
+          "discount_id = #{discountId,jdbcType=BIGINT},",
           "created_user_id = #{createdUserId,jdbcType=INTEGER},",
           "created_time = #{createdTime,jdbcType=TIMESTAMP},",
           "`status` = #{status,jdbcType=INTEGER},",

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

@@ -40,6 +40,14 @@ public class HighDiscountPackageDiscountActualSqlProvider {
             sql.VALUES("discount_package_actual_id", "#{discountPackageActualId,jdbcType=INTEGER}");
         }
         
+        if (record.getAgentId() != null) {
+            sql.VALUES("agent_id", "#{agentId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getDiscountId() != null) {
+            sql.VALUES("discount_id", "#{discountId,jdbcType=BIGINT}");
+        }
+        
         if (record.getCreatedUserId() != null) {
             sql.VALUES("created_user_id", "#{createdUserId,jdbcType=INTEGER}");
         }
@@ -77,6 +85,8 @@ public class HighDiscountPackageDiscountActualSqlProvider {
         sql.SELECT("agent_discount_code_id");
         sql.SELECT("discount_package_id");
         sql.SELECT("discount_package_actual_id");
+        sql.SELECT("agent_id");
+        sql.SELECT("discount_id");
         sql.SELECT("created_user_id");
         sql.SELECT("created_time");
         sql.SELECT("`status`");
@@ -116,6 +126,14 @@ public class HighDiscountPackageDiscountActualSqlProvider {
             sql.SET("discount_package_actual_id = #{record.discountPackageActualId,jdbcType=INTEGER}");
         }
         
+        if (record.getAgentId() != null) {
+            sql.SET("agent_id = #{record.agentId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getDiscountId() != null) {
+            sql.SET("discount_id = #{record.discountId,jdbcType=BIGINT}");
+        }
+        
         if (record.getCreatedUserId() != null) {
             sql.SET("created_user_id = #{record.createdUserId,jdbcType=INTEGER}");
         }
@@ -152,6 +170,8 @@ public class HighDiscountPackageDiscountActualSqlProvider {
         sql.SET("agent_discount_code_id = #{record.agentDiscountCodeId,jdbcType=BIGINT}");
         sql.SET("discount_package_id = #{record.discountPackageId,jdbcType=INTEGER}");
         sql.SET("discount_package_actual_id = #{record.discountPackageActualId,jdbcType=INTEGER}");
+        sql.SET("agent_id = #{record.agentId,jdbcType=BIGINT}");
+        sql.SET("discount_id = #{record.discountId,jdbcType=BIGINT}");
         sql.SET("created_user_id = #{record.createdUserId,jdbcType=INTEGER}");
         sql.SET("created_time = #{record.createdTime,jdbcType=TIMESTAMP}");
         sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
@@ -180,6 +200,14 @@ public class HighDiscountPackageDiscountActualSqlProvider {
             sql.SET("discount_package_actual_id = #{discountPackageActualId,jdbcType=INTEGER}");
         }
         
+        if (record.getAgentId() != null) {
+            sql.SET("agent_id = #{agentId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getDiscountId() != null) {
+            sql.SET("discount_id = #{discountId,jdbcType=BIGINT}");
+        }
+        
         if (record.getCreatedUserId() != null) {
             sql.SET("created_user_id = #{createdUserId,jdbcType=INTEGER}");
         }

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

@@ -33,6 +33,16 @@ public class HighDiscountPackageDiscountActual implements Serializable {
      */
     private Integer discountPackageActualId;
 
+    /**
+     * 代理商id
+     */
+    private Long agentId;
+
+    /**
+     * 优惠券id
+     */
+    private Long discountId;
+
     /**
      * 创建人
      */
@@ -97,6 +107,22 @@ public class HighDiscountPackageDiscountActual implements Serializable {
         this.discountPackageActualId = discountPackageActualId;
     }
 
+    public Long getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(Long agentId) {
+        this.agentId = agentId;
+    }
+
+    public Long getDiscountId() {
+        return discountId;
+    }
+
+    public void setDiscountId(Long discountId) {
+        this.discountId = discountId;
+    }
+
     public Integer getCreatedUserId() {
         return createdUserId;
     }
@@ -161,6 +187,8 @@ public class HighDiscountPackageDiscountActual implements Serializable {
             && (this.getAgentDiscountCodeId() == null ? other.getAgentDiscountCodeId() == null : this.getAgentDiscountCodeId().equals(other.getAgentDiscountCodeId()))
             && (this.getDiscountPackageId() == null ? other.getDiscountPackageId() == null : this.getDiscountPackageId().equals(other.getDiscountPackageId()))
             && (this.getDiscountPackageActualId() == null ? other.getDiscountPackageActualId() == null : this.getDiscountPackageActualId().equals(other.getDiscountPackageActualId()))
+            && (this.getAgentId() == null ? other.getAgentId() == null : this.getAgentId().equals(other.getAgentId()))
+            && (this.getDiscountId() == null ? other.getDiscountId() == null : this.getDiscountId().equals(other.getDiscountId()))
             && (this.getCreatedUserId() == null ? other.getCreatedUserId() == null : this.getCreatedUserId().equals(other.getCreatedUserId()))
             && (this.getCreatedTime() == null ? other.getCreatedTime() == null : this.getCreatedTime().equals(other.getCreatedTime()))
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
@@ -177,6 +205,8 @@ public class HighDiscountPackageDiscountActual implements Serializable {
         result = prime * result + ((getAgentDiscountCodeId() == null) ? 0 : getAgentDiscountCodeId().hashCode());
         result = prime * result + ((getDiscountPackageId() == null) ? 0 : getDiscountPackageId().hashCode());
         result = prime * result + ((getDiscountPackageActualId() == null) ? 0 : getDiscountPackageActualId().hashCode());
+        result = prime * result + ((getAgentId() == null) ? 0 : getAgentId().hashCode());
+        result = prime * result + ((getDiscountId() == null) ? 0 : getDiscountId().hashCode());
         result = prime * result + ((getCreatedUserId() == null) ? 0 : getCreatedUserId().hashCode());
         result = prime * result + ((getCreatedTime() == null) ? 0 : getCreatedTime().hashCode());
         result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
@@ -196,6 +226,8 @@ public class HighDiscountPackageDiscountActual implements Serializable {
         sb.append(", agentDiscountCodeId=").append(agentDiscountCodeId);
         sb.append(", discountPackageId=").append(discountPackageId);
         sb.append(", discountPackageActualId=").append(discountPackageActualId);
+        sb.append(", agentId=").append(agentId);
+        sb.append(", discountId=").append(discountId);
         sb.append(", createdUserId=").append(createdUserId);
         sb.append(", createdTime=").append(createdTime);
         sb.append(", status=").append(status);

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

@@ -365,6 +365,126 @@ public class HighDiscountPackageDiscountActualExample {
             return (Criteria) this;
         }
 
+        public Criteria andAgentIdIsNull() {
+            addCriterion("agent_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentIdIsNotNull() {
+            addCriterion("agent_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentIdEqualTo(Long value) {
+            addCriterion("agent_id =", value, "agentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentIdNotEqualTo(Long value) {
+            addCriterion("agent_id <>", value, "agentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentIdGreaterThan(Long value) {
+            addCriterion("agent_id >", value, "agentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("agent_id >=", value, "agentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentIdLessThan(Long value) {
+            addCriterion("agent_id <", value, "agentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentIdLessThanOrEqualTo(Long value) {
+            addCriterion("agent_id <=", value, "agentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentIdIn(List<Long> values) {
+            addCriterion("agent_id in", values, "agentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentIdNotIn(List<Long> values) {
+            addCriterion("agent_id not in", values, "agentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentIdBetween(Long value1, Long value2) {
+            addCriterion("agent_id between", value1, value2, "agentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentIdNotBetween(Long value1, Long value2) {
+            addCriterion("agent_id not between", value1, value2, "agentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdIsNull() {
+            addCriterion("discount_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdIsNotNull() {
+            addCriterion("discount_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdEqualTo(Long value) {
+            addCriterion("discount_id =", value, "discountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdNotEqualTo(Long value) {
+            addCriterion("discount_id <>", value, "discountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdGreaterThan(Long value) {
+            addCriterion("discount_id >", value, "discountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("discount_id >=", value, "discountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdLessThan(Long value) {
+            addCriterion("discount_id <", value, "discountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdLessThanOrEqualTo(Long value) {
+            addCriterion("discount_id <=", value, "discountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdIn(List<Long> values) {
+            addCriterion("discount_id in", values, "discountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdNotIn(List<Long> values) {
+            addCriterion("discount_id not in", values, "discountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdBetween(Long value1, Long value2) {
+            addCriterion("discount_id between", value1, value2, "discountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIdNotBetween(Long value1, Long value2) {
+            addCriterion("discount_id not between", value1, value2, "discountId");
+            return (Criteria) this;
+        }
+
         public Criteria andCreatedUserIdIsNull() {
             addCriterion("created_user_id is null");
             return (Criteria) this;