diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java index c8ab10c..99a28a1 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java +++ b/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(); } -} \ No newline at end of file + + public void setStockNumber(Integer stockNumber) { + this.stockNumber = stockNumber; + } + + public Integer getStockNumber() { + return this.stockNumber; + } +} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductSku.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductSku.java index 924f457..791f335 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductSku.java +++ b/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; } -} \ No newline at end of file + + public Integer getIsPauseSale() { + return isPauseSale; + } + + public void setIsPauseSale(Integer isPauseSale) { + this.isPauseSale = isPauseSale; + } +} diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml index de28bdf..1b05eac 100644 --- a/src/main/resources/mapper/TbProductMapper.xml +++ b/src/main/resources/mapper/TbProductMapper.xml @@ -63,6 +63,7 @@ + @@ -73,21 +74,21 @@ - id, category_id, spec_id, source_path, brand_id, merchant_id, shop_id, name, short_title, + id, category_id, spec_id, source_path, brand_id, merchant_id, shop_id, name, short_title, type, pack_fee, low_price, low_member_price, unit_id, unit_snap, cover_img, share_img, images, - video_cover_img, sort, limit_number, product_score, status, fail_msg, is_recommend, - is_hot, is_new, is_on_sale, is_show, type_enum, is_distribute, is_del, is_stock, - is_pause_sale, is_free_freight, freight_id, strategy_type, strategy_id, is_vip, is_delete, - 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 + video_cover_img, sort, limit_number, product_score, status, fail_msg, is_recommend, + is_hot, is_new, is_on_sale, is_show, type_enum, is_distribute, is_del, is_stock, + is_pause_sale, is_free_freight, freight_id, strategy_type, strategy_id, is_vip, is_delete, + 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,stock_number images, video, notice, group_snap, spec_info, select_spec - \ No newline at end of file + diff --git a/src/main/resources/mapper/TbProductSkuMapper.xml b/src/main/resources/mapper/TbProductSkuMapper.xml index c928a35..62bd462 100644 --- a/src/main/resources/mapper/TbProductSkuMapper.xml +++ b/src/main/resources/mapper/TbProductSkuMapper.xml @@ -23,21 +23,22 @@ + - 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 + 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, is_pause_sale spec_info, spec_snap - \ No newline at end of file +