同步skums数据新增品牌信息

data-base/base-sync-sku/src/main/java/com/bailuntec/domain/pojo/SkuInfo.java

@@ -434,4 +434,6 @@ public class SkuInfo {
     public Integer categorySimpleId;
 
     public String categorySimpleName;
+
+    public String brand;
 }

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseSku.java

@@ -629,6 +629,15 @@ public class DcBaseSku {
     private String categorySimpleName;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_sku.brand
+     *
+     * @mbg.generated
+     */
+    private String brand;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_sku
      *
@@ -709,6 +718,7 @@ public class DcBaseSku {
         sb.append(", companyId=").append(companyId);
         sb.append(", categorySimpleId=").append(categorySimpleId);
         sb.append(", categorySimpleName=").append(categorySimpleName);
+        sb.append(", brand=").append(brand);
         sb.append("]");
         return sb.toString();
     }
@@ -799,7 +809,8 @@ public class DcBaseSku {
             && (this.getDevelopTime() == null ? other.getDevelopTime() == null : this.getDevelopTime().equals(other.getDevelopTime()))
             && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
             && (this.getCategorySimpleId() == null ? other.getCategorySimpleId() == null : this.getCategorySimpleId().equals(other.getCategorySimpleId()))
-            && (this.getCategorySimpleName() == null ? other.getCategorySimpleName() == null : this.getCategorySimpleName().equals(other.getCategorySimpleName()));
+            && (this.getCategorySimpleName() == null ? other.getCategorySimpleName() == null : this.getCategorySimpleName().equals(other.getCategorySimpleName()))
+            && (this.getBrand() == null ? other.getBrand() == null : this.getBrand().equals(other.getBrand()));
     }
 
     /**
@@ -881,6 +892,7 @@ public class DcBaseSku {
         result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
         result = prime * result + ((getCategorySimpleId() == null) ? 0 : getCategorySimpleId().hashCode());
         result = prime * result + ((getCategorySimpleName() == null) ? 0 : getCategorySimpleName().hashCode());
+        result = prime * result + ((getBrand() == null) ? 0 : getBrand().hashCode());
         return result;
     }
 }
\ No newline at end of file

data-common/src/main/java/com/bailuntec/domain/example/DcBaseSkuExample.java

@@ -4840,6 +4840,76 @@ public class DcBaseSkuExample {
             addCriterion("category_simple_name not between", value1, value2, "categorySimpleName");
             return (Criteria) this;
         }
+
+        public Criteria andBrandIsNull() {
+            addCriterion("brand is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIsNotNull() {
+            addCriterion("brand is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandEqualTo(String value) {
+            addCriterion("brand =", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandNotEqualTo(String value) {
+            addCriterion("brand <>", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandGreaterThan(String value) {
+            addCriterion("brand >", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandGreaterThanOrEqualTo(String value) {
+            addCriterion("brand >=", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandLessThan(String value) {
+            addCriterion("brand <", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandLessThanOrEqualTo(String value) {
+            addCriterion("brand <=", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandLike(String value) {
+            addCriterion("brand like", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandNotLike(String value) {
+            addCriterion("brand not like", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIn(List<String> values) {
+            addCriterion("brand in", values, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandNotIn(List<String> values) {
+            addCriterion("brand not in", values, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandBetween(String value1, String value2) {
+            addCriterion("brand between", value1, value2, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandNotBetween(String value1, String value2) {
+            addCriterion("brand not between", value1, value2, "brand");
+            return (Criteria) this;
+        }
     }
 
     /**

data-common/src/main/java/com/bailuntec/mapper/DcBaseSkuMapper.xml

@@ -75,6 +75,7 @@
     <result column="company_id" jdbcType="INTEGER" property="companyId" />
     <result column="category_simple_id" jdbcType="INTEGER" property="categorySimpleId" />
     <result column="category_simple_name" jdbcType="VARCHAR" property="categorySimpleName" />
+    <result column="brand" jdbcType="VARCHAR" property="brand" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -157,7 +158,7 @@
     declare_title_cn, pick_title_cn, pick_title_en, product_nature, charger_specifications, 
     packing_price, packing_name, packing_size, product_size, packing_weight, unit, push_status, 
     transfer_delivery, source, push_time, has_delete, develop_time, company_id, category_simple_id, 
-    category_simple_name
+    category_simple_name, brand
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseSkuExample" resultMap="BaseResultMap">
     <!--
@@ -240,8 +241,8 @@
       product_size, packing_weight, unit, 
       push_status, transfer_delivery, source, 
       push_time, has_delete, develop_time, 
-      company_id, category_simple_id, category_simple_name
-      )
+      company_id, category_simple_id, category_simple_name, 
+      brand)
     values (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{skuImage,jdbcType=VARCHAR}, 
       #{categoryId,jdbcType=INTEGER}, #{categoryName,jdbcType=VARCHAR}, #{unitPrice,jdbcType=DECIMAL}, 
       #{sellerId,jdbcType=INTEGER}, #{sellerName,jdbcType=VARCHAR}, #{length,jdbcType=DECIMAL}, 
@@ -264,8 +265,8 @@
       #{productSize,jdbcType=VARCHAR}, #{packingWeight,jdbcType=DECIMAL}, #{unit,jdbcType=VARCHAR}, 
       #{pushStatus,jdbcType=TINYINT}, #{transferDelivery,jdbcType=INTEGER}, #{source,jdbcType=TINYINT}, 
       #{pushTime,jdbcType=TIMESTAMP}, #{hasDelete,jdbcType=BIT}, #{developTime,jdbcType=TIMESTAMP}, 
-      #{companyId,jdbcType=INTEGER}, #{categorySimpleId,jdbcType=INTEGER}, #{categorySimpleName,jdbcType=VARCHAR}
-      )
+      #{companyId,jdbcType=INTEGER}, #{categorySimpleId,jdbcType=INTEGER}, #{categorySimpleName,jdbcType=VARCHAR}, 
+      #{brand,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseSku">
     <!--
@@ -481,6 +482,9 @@
       <if test="categorySimpleName != null">
         category_simple_name,
       </if>
+      <if test="brand != null">
+        brand,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -690,6 +694,9 @@
       <if test="categorySimpleName != null">
         #{categorySimpleName,jdbcType=VARCHAR},
       </if>
+      <if test="brand != null">
+        #{brand,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseSkuExample" resultType="java.lang.Long">
@@ -916,6 +923,9 @@
       <if test="record.categorySimpleName != null">
         category_simple_name = #{record.categorySimpleName,jdbcType=VARCHAR},
       </if>
+      <if test="record.brand != null">
+        brand = #{record.brand,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -995,7 +1005,8 @@
       develop_time = #{record.developTime,jdbcType=TIMESTAMP},
       company_id = #{record.companyId,jdbcType=INTEGER},
       category_simple_id = #{record.categorySimpleId,jdbcType=INTEGER},
-      category_simple_name = #{record.categorySimpleName,jdbcType=VARCHAR}
+      category_simple_name = #{record.categorySimpleName,jdbcType=VARCHAR},
+      brand = #{record.brand,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1211,6 +1222,9 @@
       <if test="categorySimpleName != null">
         category_simple_name = #{categorySimpleName,jdbcType=VARCHAR},
       </if>
+      <if test="brand != null">
+        brand = #{brand,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1287,7 +1301,8 @@
       develop_time = #{developTime,jdbcType=TIMESTAMP},
       company_id = #{companyId,jdbcType=INTEGER},
       category_simple_id = #{categorySimpleId,jdbcType=INTEGER},
-      category_simple_name = #{categorySimpleName,jdbcType=VARCHAR}
+      category_simple_name = #{categorySimpleName,jdbcType=VARCHAR},
+      brand = #{brand,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseSku">
@@ -1505,6 +1520,9 @@
       <if test="categorySimpleName != null">
         category_simple_name,
       </if>
+      <if test="brand != null">
+        brand,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -1715,6 +1733,9 @@
       <if test="categorySimpleName != null">
         #{categorySimpleName,jdbcType=VARCHAR},
       </if>
+      <if test="brand != null">
+        #{brand,jdbcType=VARCHAR},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -1925,6 +1946,9 @@
       <if test="categorySimpleName != null">
         category_simple_name = #{categorySimpleName,jdbcType=VARCHAR},
       </if>
+      <if test="brand != null">
+        brand = #{brand,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseSku">
@@ -1944,7 +1968,7 @@
       declare_title_cn, pick_title_cn, pick_title_en, product_nature, charger_specifications, 
       packing_price, packing_name, packing_size, product_size, packing_weight, unit, 
       push_status, transfer_delivery, source, push_time, has_delete, develop_time, company_id, 
-      category_simple_id, category_simple_name)
+      category_simple_id, category_simple_name, brand)
     values
     (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{skuImage,jdbcType=VARCHAR}, 
       #{categoryId,jdbcType=INTEGER}, #{categoryName,jdbcType=VARCHAR}, #{unitPrice,jdbcType=DECIMAL}, 
@@ -1968,8 +1992,8 @@
       #{productSize,jdbcType=VARCHAR}, #{packingWeight,jdbcType=DECIMAL}, #{unit,jdbcType=VARCHAR}, 
       #{pushStatus,jdbcType=TINYINT}, #{transferDelivery,jdbcType=INTEGER}, #{source,jdbcType=TINYINT}, 
       #{pushTime,jdbcType=TIMESTAMP}, #{hasDelete,jdbcType=BIT}, #{developTime,jdbcType=TIMESTAMP}, 
-      #{companyId,jdbcType=INTEGER}, #{categorySimpleId,jdbcType=INTEGER}, #{categorySimpleName,jdbcType=VARCHAR}
-      )
+      #{companyId,jdbcType=INTEGER}, #{categorySimpleId,jdbcType=INTEGER}, #{categorySimpleName,jdbcType=VARCHAR}, 
+      #{brand,jdbcType=VARCHAR})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     bailun_sku = #{bailunSku,jdbcType=VARCHAR}, 
@@ -2039,7 +2063,8 @@
     develop_time = #{developTime,jdbcType=TIMESTAMP}, 
     company_id = #{companyId,jdbcType=INTEGER}, 
     category_simple_id = #{categorySimpleId,jdbcType=INTEGER}, 
-    category_simple_name = #{categorySimpleName,jdbcType=VARCHAR}
+    category_simple_name = #{categorySimpleName,jdbcType=VARCHAR}, 
+    brand = #{brand,jdbcType=VARCHAR}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseSkuExample" resultMap="BaseResultMap">
     <!--