添加字段

.gitignore

@@ -0,0 +1 @@
+/target/

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java

@@ -131,6 +131,8 @@ public class TbProduct implements Serializable {
     private String cartNumber="0";
     private String groupCategoryId;
 
+    private Integer stockNumber;
+
 
     public String getImages() {
         return images;
@@ -650,4 +652,12 @@ public class TbProduct implements Serializable {
     public void setSpecTableHeaders(String specTableHeaders) {
         this.specTableHeaders = specTableHeaders == null ? null : specTableHeaders.trim();
     }
+
+    public void setStockNumber(Integer stockNumber) {
+        this.stockNumber = stockNumber;
+    }
+
+    public Integer getStockNumber() {
+        return this.stockNumber;
+    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductSku.java

@@ -46,6 +46,8 @@ public class TbProductSku implements Serializable {
 
     private Long updatedAt;
 
+    private Integer isPauseSale = 0;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -215,4 +217,12 @@ public class TbProductSku implements Serializable {
     public void setUpdatedAt(Long updatedAt) {
         this.updatedAt = updatedAt;
     }
+
+    public Integer getIsPauseSale() {
+        return isPauseSale;
+    }
+
+    public void setIsPauseSale(Integer isPauseSale) {
+        this.isPauseSale = isPauseSale;
+    }
 }

src/main/resources/mapper/TbProductMapper.xml

@@ -63,6 +63,7 @@
     <result column="tax_config_id" jdbcType="VARCHAR" property="taxConfigId" />
     <result column="spec_table_headers" jdbcType="VARCHAR" property="specTableHeaders" />
     <result column="group_category_id" jdbcType="VARCHAR" property="groupCategoryId" />
+    <result column="stock_number" jdbcType="INTEGER" property="stockNumber" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
     <result column="images" jdbcType="LONGVARCHAR" property="images" />
@@ -81,7 +82,7 @@
     created_at, updated_at, base_sales_number, real_sales_number, sales_number, thumb_count,
     store_count, furnish_meal, furnish_express, furnish_draw, furnish_vir, is_combo,
     is_show_cash, is_show_mall, is_need_examine, show_on_mall_status, show_on_mall_time,
-    show_on_mall_error_msg, enable_label, tax_config_id, spec_table_headers,group_category_id
+    show_on_mall_error_msg, enable_label, tax_config_id, spec_table_headers,group_category_id,stock_number
   </sql>
   <sql id="Blob_Column_List">
     images, video, notice, group_snap, spec_info, select_spec
@@ -120,7 +121,7 @@
       show_on_mall_status, show_on_mall_time, show_on_mall_error_msg,
       enable_label, tax_config_id, spec_table_headers,
       images, video, notice,
-      group_snap, spec_info, select_spec
+      group_snap, spec_info, select_spec,group_category_id,stock_number
       )
     values (#{id,jdbcType=INTEGER}, #{categoryId,jdbcType=VARCHAR}, #{specId,jdbcType=INTEGER},
       #{sourcePath,jdbcType=VARCHAR}, #{brandId,jdbcType=INTEGER}, #{merchantId,jdbcType=VARCHAR},
@@ -143,7 +144,9 @@
       #{showOnMallStatus,jdbcType=TINYINT}, #{showOnMallTime,jdbcType=BIGINT}, #{showOnMallErrorMsg,jdbcType=VARCHAR},
       #{enableLabel,jdbcType=TINYINT}, #{taxConfigId,jdbcType=VARCHAR}, #{specTableHeaders,jdbcType=VARCHAR},
       #{images,jdbcType=LONGVARCHAR}, #{video,jdbcType=LONGVARCHAR}, #{notice,jdbcType=LONGVARCHAR},
-      #{groupSnap,jdbcType=LONGVARCHAR}, #{specInfo,jdbcType=LONGVARCHAR}, #{selectSpec,jdbcType=LONGVARCHAR}
+      #{groupSnap,jdbcType=LONGVARCHAR}, #{specInfo,jdbcType=LONGVARCHAR}, #{selectSpec,jdbcType=LONGVARCHAR},
+            #{groupCategoryId,jdbcType=VARCHAR},#{stockNumber,jdbcType=INTEGER},
+        #{groupCategoryId,jdbcType=VARCHAR},#{stockNumber,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
@@ -347,6 +350,12 @@
       <if test="selectSpec != null">
         select_spec,
       </if>
+        <if test="groupCategoryId != null">
+            group_category_id,
+        </if>
+        <if test="stockNumber != null">
+            stock_number,
+        </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -547,6 +556,12 @@
       <if test="selectSpec != null">
         #{selectSpec,jdbcType=LONGVARCHAR},
       </if>
+        <if test="groupCategoryId != null">
+            #{groupCategoryId,jdbcType=VARCHAR},
+        </if>
+        <if test="stockNumber != null">
+            #{stockNumber,jdbcType=INTEGER},
+        </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
@@ -747,6 +762,12 @@
       <if test="selectSpec != null">
         select_spec = #{selectSpec,jdbcType=LONGVARCHAR},
       </if>
+        <if test="groupCategoryId != null">
+            group_category_id = #{groupCategoryId,jdbcType=VARCHAR},
+        </if>
+        <if test="stockNumber != null">
+            stock_number = #{stockNumber,jdbcType=INTEGER},
+        </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -816,7 +837,9 @@
       notice = #{notice,jdbcType=LONGVARCHAR},
       group_snap = #{groupSnap,jdbcType=LONGVARCHAR},
       spec_info = #{specInfo,jdbcType=LONGVARCHAR},
-      select_spec = #{selectSpec,jdbcType=LONGVARCHAR}
+      select_spec = #{selectSpec,jdbcType=LONGVARCHAR},
+        group_category_id = #{groupCategoryId,jdbcType=VARCHAR},
+        stock_number = #{stockNumber,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProduct">
@@ -879,7 +902,9 @@
       show_on_mall_error_msg = #{showOnMallErrorMsg,jdbcType=VARCHAR},
       enable_label = #{enableLabel,jdbcType=TINYINT},
       tax_config_id = #{taxConfigId,jdbcType=VARCHAR},
-      spec_table_headers = #{specTableHeaders,jdbcType=VARCHAR}
+      spec_table_headers = #{specTableHeaders,jdbcType=VARCHAR},
+       group_category_id = #{groupCategoryId,jdbcType=VARCHAR},
+        stock_number = #{stockNumber,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="upGroupRealSalesNumber">

src/main/resources/mapper/TbProductSkuMapper.xml

@@ -23,6 +23,7 @@
     <result column="second_shared" jdbcType="DECIMAL" property="secondShared" />
     <result column="created_at" jdbcType="BIGINT" property="createdAt" />
     <result column="updated_at" jdbcType="BIGINT" property="updatedAt" />
+    <result column="is_pause_sale" jdbcType="INTEGER" property="isPauseSale" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.chaozhanggui.system.cashierservice.entity.TbProductSkuWithBLOBs">
     <result column="spec_info" jdbcType="LONGVARCHAR" property="specInfo" />
@@ -31,7 +32,7 @@
   <sql id="Base_Column_List">
     id, shop_id, bar_code, product_id, origin_price, cost_price, member_price, meal_price,
     sale_price, guide_price, strategy_price, stock_number, cover_img, warn_line, weight,
-    volume, real_sales_number, first_shared, second_shared, created_at, updated_at
+    volume, real_sales_number, first_shared, second_shared, created_at, updated_at, is_pause_sale
   </sql>
   <sql id="Blob_Column_List">
     spec_info, spec_snap
@@ -61,7 +62,7 @@
       cover_img, warn_line, weight,
       volume, real_sales_number, first_shared,
       second_shared, created_at, updated_at,
-      spec_info, spec_snap)
+      spec_info, spec_snap, is_pause_sale)
     values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=VARCHAR}, #{barCode,jdbcType=VARCHAR},
       #{productId,jdbcType=VARCHAR}, #{originPrice,jdbcType=DECIMAL}, #{costPrice,jdbcType=DECIMAL},
       #{memberPrice,jdbcType=DECIMAL}, #{mealPrice,jdbcType=DECIMAL}, #{salePrice,jdbcType=DECIMAL},
@@ -69,7 +70,8 @@
       #{coverImg,jdbcType=VARCHAR}, #{warnLine,jdbcType=INTEGER}, #{weight,jdbcType=DOUBLE},
       #{volume,jdbcType=REAL}, #{realSalesNumber,jdbcType=DOUBLE}, #{firstShared,jdbcType=DECIMAL},
       #{secondShared,jdbcType=DECIMAL}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT},
-      #{specInfo,jdbcType=LONGVARCHAR}, #{specSnap,jdbcType=LONGVARCHAR})
+      #{specInfo,jdbcType=LONGVARCHAR}, #{specSnap,jdbcType=LONGVARCHAR}),
+        #{isPauseSale,jdbcType=INTEGER}
   </insert>
   <insert id="insertSelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductSkuWithBLOBs">
     insert into tb_product_sku
@@ -143,6 +145,9 @@
       <if test="specSnap != null">
         spec_snap,
       </if>
+        <if test="isPauseSale != null">
+            is_pause_sale,
+        </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -214,6 +219,9 @@
       <if test="specSnap != null">
         #{specSnap,jdbcType=LONGVARCHAR},
       </if>
+        <if test="isPauseSale != null">
+            #{isPauseSale,jdbcType=INTEGER},
+        </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductSkuWithBLOBs">
@@ -285,6 +293,9 @@
       <if test="specSnap != null">
         spec_snap = #{specSnap,jdbcType=LONGVARCHAR},
       </if>
+        <if test="isPauseSale != null">
+            is_pause_sale = #{isPauseSale,jdbcType=INTEGER},
+        </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -311,7 +322,8 @@
       created_at = #{createdAt,jdbcType=BIGINT},
       updated_at = #{updatedAt,jdbcType=BIGINT},
       spec_info = #{specInfo,jdbcType=LONGVARCHAR},
-      spec_snap = #{specSnap,jdbcType=LONGVARCHAR}
+      spec_snap = #{specSnap,jdbcType=LONGVARCHAR},
+        is_pause_sale = #{isPauseSale,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductSku">
@@ -335,7 +347,8 @@
       first_shared = #{firstShared,jdbcType=DECIMAL},
       second_shared = #{secondShared,jdbcType=DECIMAL},
       created_at = #{createdAt,jdbcType=BIGINT},
-      updated_at = #{updatedAt,jdbcType=BIGINT}
+      updated_at = #{updatedAt,jdbcType=BIGINT},
+        is_pause_sale = #{isPauseSale,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
     <update id="updateStockById">