提交代码

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

@@ -50,9 +50,10 @@ public interface HighMerchantStoreMapper extends HighMerchantStoreMapperExt {
         "longitude, latitude, ",
         "device_sn, device_key, ",
         "device_name, prestore_type, ",
-        "operator_id, operator_name, ",
+        "industry_type, operator_id, ",
-        "update_time, create_time, ",
+        "operator_name, update_time, ",
-        "ext_1, ext_2, ext_3)",
+        "create_time, ext_1, ",
+        "ext_2, ext_3)",
         "values (#{type,jdbcType=INTEGER}, #{sourceType,jdbcType=INTEGER}, ",
         "#{brandId,jdbcType=BIGINT}, #{brandName,jdbcType=VARCHAR}, ",
         "#{regionId,jdbcType=BIGINT}, #{regionName,jdbcType=VARCHAR}, ",
@@ -64,9 +65,10 @@ public interface HighMerchantStoreMapper extends HighMerchantStoreMapperExt {
         "#{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, ",
         "#{deviceSn,jdbcType=VARCHAR}, #{deviceKey,jdbcType=VARCHAR}, ",
         "#{deviceName,jdbcType=VARCHAR}, #{prestoreType,jdbcType=INTEGER}, ",
-        "#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ",
+        "#{industryType,jdbcType=INTEGER}, #{operatorId,jdbcType=BIGINT}, ",
-        "#{updateTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{operatorName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, ",
-        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+        "#{createTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(HighMerchantStore record);
@@ -100,6 +102,7 @@ public interface HighMerchantStoreMapper extends HighMerchantStoreMapperExt {
         @Result(column="device_key", property="deviceKey", jdbcType=JdbcType.VARCHAR),
         @Result(column="device_name", property="deviceName", jdbcType=JdbcType.VARCHAR),
         @Result(column="prestore_type", property="prestoreType", jdbcType=JdbcType.INTEGER),
+        @Result(column="industry_type", property="industryType", jdbcType=JdbcType.INTEGER),
         @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT),
         @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@@ -115,8 +118,8 @@ public interface HighMerchantStoreMapper extends HighMerchantStoreMapperExt {
         "id, `type`, source_type, brand_id, brand_name, region_id, region_name, company_id, ",
         "merchant_id, store_logo, store_key, store_name, store_desc, telephone, contact_name, ",
         "address, `status`, longitude, latitude, device_sn, device_key, device_name, ",
-        "prestore_type, operator_id, operator_name, update_time, create_time, ext_1, ",
+        "prestore_type, industry_type, operator_id, operator_name, update_time, create_time, ",
-        "ext_2, ext_3",
+        "ext_1, ext_2, ext_3",
         "from high_merchant_store",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -144,6 +147,7 @@ public interface HighMerchantStoreMapper extends HighMerchantStoreMapperExt {
         @Result(column="device_key", property="deviceKey", jdbcType=JdbcType.VARCHAR),
         @Result(column="device_name", property="deviceName", jdbcType=JdbcType.VARCHAR),
         @Result(column="prestore_type", property="prestoreType", jdbcType=JdbcType.INTEGER),
+        @Result(column="industry_type", property="industryType", jdbcType=JdbcType.INTEGER),
         @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT),
         @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@@ -187,6 +191,7 @@ public interface HighMerchantStoreMapper extends HighMerchantStoreMapperExt {
           "device_key = #{deviceKey,jdbcType=VARCHAR},",
           "device_name = #{deviceName,jdbcType=VARCHAR},",
           "prestore_type = #{prestoreType,jdbcType=INTEGER},",
+          "industry_type = #{industryType,jdbcType=INTEGER},",
           "operator_id = #{operatorId,jdbcType=BIGINT},",
           "operator_name = #{operatorName,jdbcType=VARCHAR},",
           "update_time = #{updateTime,jdbcType=TIMESTAMP},",

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

@@ -116,6 +116,10 @@ public class HighMerchantStoreSqlProvider {
             sql.VALUES("prestore_type", "#{prestoreType,jdbcType=INTEGER}");
         }
         
+        if (record.getIndustryType() != null) {
+            sql.VALUES("industry_type", "#{industryType,jdbcType=INTEGER}");
+        }
+        
         if (record.getOperatorId() != null) {
             sql.VALUES("operator_id", "#{operatorId,jdbcType=BIGINT}");
         }
@@ -176,6 +180,7 @@ public class HighMerchantStoreSqlProvider {
         sql.SELECT("device_key");
         sql.SELECT("device_name");
         sql.SELECT("prestore_type");
+        sql.SELECT("industry_type");
         sql.SELECT("operator_id");
         sql.SELECT("operator_name");
         sql.SELECT("update_time");
@@ -292,6 +297,10 @@ public class HighMerchantStoreSqlProvider {
             sql.SET("prestore_type = #{record.prestoreType,jdbcType=INTEGER}");
         }
         
+        if (record.getIndustryType() != null) {
+            sql.SET("industry_type = #{record.industryType,jdbcType=INTEGER}");
+        }
+        
         if (record.getOperatorId() != null) {
             sql.SET("operator_id = #{record.operatorId,jdbcType=BIGINT}");
         }
@@ -351,6 +360,7 @@ public class HighMerchantStoreSqlProvider {
         sql.SET("device_key = #{record.deviceKey,jdbcType=VARCHAR}");
         sql.SET("device_name = #{record.deviceName,jdbcType=VARCHAR}");
         sql.SET("prestore_type = #{record.prestoreType,jdbcType=INTEGER}");
+        sql.SET("industry_type = #{record.industryType,jdbcType=INTEGER}");
         sql.SET("operator_id = #{record.operatorId,jdbcType=BIGINT}");
         sql.SET("operator_name = #{record.operatorName,jdbcType=VARCHAR}");
         sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
@@ -456,6 +466,10 @@ public class HighMerchantStoreSqlProvider {
             sql.SET("prestore_type = #{prestoreType,jdbcType=INTEGER}");
         }
         
+        if (record.getIndustryType() != null) {
+            sql.SET("industry_type = #{industryType,jdbcType=INTEGER}");
+        }
+        
         if (record.getOperatorId() != null) {
             sql.SET("operator_id = #{operatorId,jdbcType=BIGINT}");
         }

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

@@ -128,6 +128,11 @@ public class HighMerchantStore implements Serializable {
      */
     private Integer prestoreType;
 
+    /**
+     * 行业类型
+     */
+    private Integer industryType;
+
     /**
      * 操作人id
      */
@@ -154,26 +159,6 @@ public class HighMerchantStore implements Serializable {
 
     private String ext3;
 
-    private Double distance;
-
-    private HighMerchant highMerchant;
-
-    public Double getDistance() {
-        return distance;
-    }
-
-    public void setDistance(Double distance) {
-        this.distance = distance;
-    }
-
-    public HighMerchant getHighMerchant() {
-        return highMerchant;
-    }
-
-    public void setHighMerchant(HighMerchant highMerchant) {
-        this.highMerchant = highMerchant;
-    }
-
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -360,6 +345,14 @@ public class HighMerchantStore implements Serializable {
         this.prestoreType = prestoreType;
     }
 
+    public Integer getIndustryType() {
+        return industryType;
+    }
+
+    public void setIndustryType(Integer industryType) {
+        this.industryType = industryType;
+    }
+
     public Long getOperatorId() {
         return operatorId;
     }
@@ -451,6 +444,7 @@ public class HighMerchantStore implements Serializable {
             && (this.getDeviceKey() == null ? other.getDeviceKey() == null : this.getDeviceKey().equals(other.getDeviceKey()))
             && (this.getDeviceName() == null ? other.getDeviceName() == null : this.getDeviceName().equals(other.getDeviceName()))
             && (this.getPrestoreType() == null ? other.getPrestoreType() == null : this.getPrestoreType().equals(other.getPrestoreType()))
+            && (this.getIndustryType() == null ? other.getIndustryType() == null : this.getIndustryType().equals(other.getIndustryType()))
             && (this.getOperatorId() == null ? other.getOperatorId() == null : this.getOperatorId().equals(other.getOperatorId()))
             && (this.getOperatorName() == null ? other.getOperatorName() == null : this.getOperatorName().equals(other.getOperatorName()))
             && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
@@ -487,6 +481,7 @@ public class HighMerchantStore implements Serializable {
         result = prime * result + ((getDeviceKey() == null) ? 0 : getDeviceKey().hashCode());
         result = prime * result + ((getDeviceName() == null) ? 0 : getDeviceName().hashCode());
         result = prime * result + ((getPrestoreType() == null) ? 0 : getPrestoreType().hashCode());
+        result = prime * result + ((getIndustryType() == null) ? 0 : getIndustryType().hashCode());
         result = prime * result + ((getOperatorId() == null) ? 0 : getOperatorId().hashCode());
         result = prime * result + ((getOperatorName() == null) ? 0 : getOperatorName().hashCode());
         result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
@@ -526,6 +521,7 @@ public class HighMerchantStore implements Serializable {
         sb.append(", deviceKey=").append(deviceKey);
         sb.append(", deviceName=").append(deviceName);
         sb.append(", prestoreType=").append(prestoreType);
+        sb.append(", industryType=").append(industryType);
         sb.append(", operatorId=").append(operatorId);
         sb.append(", operatorName=").append(operatorName);
         sb.append(", updateTime=").append(updateTime);

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

@@ -1645,6 +1645,66 @@ public class HighMerchantStoreExample {
             return (Criteria) this;
         }
 
+        public Criteria andIndustryTypeIsNull() {
+            addCriterion("industry_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryTypeIsNotNull() {
+            addCriterion("industry_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryTypeEqualTo(Integer value) {
+            addCriterion("industry_type =", value, "industryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryTypeNotEqualTo(Integer value) {
+            addCriterion("industry_type <>", value, "industryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryTypeGreaterThan(Integer value) {
+            addCriterion("industry_type >", value, "industryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("industry_type >=", value, "industryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryTypeLessThan(Integer value) {
+            addCriterion("industry_type <", value, "industryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("industry_type <=", value, "industryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryTypeIn(List<Integer> values) {
+            addCriterion("industry_type in", values, "industryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryTypeNotIn(List<Integer> values) {
+            addCriterion("industry_type not in", values, "industryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryTypeBetween(Integer value1, Integer value2) {
+            addCriterion("industry_type between", value1, value2, "industryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("industry_type not between", value1, value2, "industryType");
+            return (Criteria) this;
+        }
+
         public Criteria andOperatorIdIsNull() {
             addCriterion("operator_id is null");
             return (Criteria) this;