From 5eb1403647c328e8deef064daef6b3de4aa806fc Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 19 Nov 2024 10:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AD=97=E6=AE=B5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/TbProduct.java             | 6 +-----
 src/main/resources/mapper/TbProductMapper.xml               | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

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 6e2d092..14a982d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
@@ -42,7 +42,7 @@ public class TbProduct implements Serializable {
      */
     private String shortTitle;
     /**
-     * 商品类型（属性）:REAL- 实物商品 VIR---虚拟商品
+     * 商品类型（属性）:普通商品 normal 套餐商品 package 称重商品 weigh 团购券商品 coupon
      */
     private String type;
     /**
@@ -104,10 +104,6 @@ public class TbProduct implements Serializable {
      * 是否暂停销售
      */
     private Integer isPauseSale;
-    /**
-     * 是否删除0不删1删除
-     */
-    private Integer isDelete;
 
     private Long createdAt;
 
diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml
index 57f74ee..84e9c14 100644
--- a/src/main/resources/mapper/TbProductMapper.xml
+++ b/src/main/resources/mapper/TbProductMapper.xml
@@ -25,7 +25,6 @@
         <result property="isDel" column="is_del" jdbcType="INTEGER"/>
         <result property="isStock" column="is_stock" jdbcType="INTEGER"/>
         <result property="isPauseSale" column="is_pause_sale" jdbcType="INTEGER"/>
-        <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>
         <result property="createdAt" column="created_at" jdbcType="INTEGER"/>
         <result property="updatedAt" column="updated_at" jdbcType="INTEGER"/>
         <result property="specTableHeaders" column="spec_table_headers" jdbcType="VARCHAR"/>
@@ -40,7 +39,7 @@
     <sql id="Base_Column_List">
         id
         , category_id, spec_id, merchant_id, shop_id, name, short_title, type, pack_fee, low_price, low_member_price,
-        unit_id, cover_img, images, sort, status, fail_msg, is_hot, type_enum, is_del, is_stock, is_pause_sale, is_delete,
+        unit_id, cover_img, images, sort, status, fail_msg, is_hot, type_enum, is_del, is_stock, is_pause_sale,
         created_at, updated_at,  group_snap, spec_info, select_spec,
         spec_table_headers, group_category_id, real_sales_number, stock_number, is_grounding, is_refund_stock, warn_line  </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -233,7 +232,6 @@
         LEFT JOIN tb_shop_info AS info ON info.id = `order`.shop_id
         <where>
             info.`status`='1'
-#             AND pro.is_combo = '1'
             AND pro.type_enum = 'group'
             AND (info.cities = #{cities} or info.districts = #{cities})
             <if test="proName != null and proName != ''">