Merge branch 'refs/heads/dev'

2024-07-04 09:32:14 +08:00
parent a1894d0953 f041c983a5
commit 435c81a4f4
35 changed files with 1322 additions and 240 deletions
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -40,12 +40,6 @@ spring:
    port: 5672
    username: admin
    password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql

 mybatis:
  configuration:
@@ -65,6 +59,9 @@ server:
  port: 9888
 prod: dev1
 queue: cart_queue_putdev1
+subscribe:
+  message:
+    miniprogramState: trial



--- a/src/main/resources/application-dev2.yml
+++ b/src/main/resources/application-dev2.yml
@@ -37,12 +37,7 @@ spring:
    port: 5672
    username: admin
    password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql
+

 mybatis:
  configuration:
--- a/src/main/resources/application-hph.yml
+++ b/src/main/resources/application-hph.yml
@@ -39,12 +39,6 @@ spring:
    port: 5672
    username: admin
    password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql

 mybatis:
  configuration:
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -39,12 +39,6 @@ spring:
    port: 5672
    username: admin
    password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql

 mybatis:
  configuration:
@@ -62,6 +56,9 @@ thirdPay:
  callFSTBack: https://cashier.sxczgkj.cn${server.servlet.context-path}notify/notifyfstCallBack
 prod: prod1
 queue: cart_queue_putprod1
+subscribe:
+  message:
+    miniprogramState: formal



--- a/src/main/resources/application-prod2.yml
+++ b/src/main/resources/application-prod2.yml
@@ -39,12 +39,6 @@ spring:
    port: 5672
    username: admin
    password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql

 mybatis:
  configuration:
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -37,12 +37,6 @@ spring:
    port: 5672
    username: admin
    password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql

 mybatis:
  configuration:
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,8 +5,8 @@ server:
 wx:
  login:
    business:
-      appId:
-      secrete:
+      appId: wxcf0fe8cdba153fd6
+      secrete: c33e06467c6879a62af633d50ed6b720
    custom:
      appId: wxd88fffa983758a30
      secrete: a34a61adc0602118b49400baa8812454
@@ -15,6 +15,10 @@ wx:
 #      卓尔
 #      appId: wx0dcea6001b0a8fb4
 #      secrete: ba42423cce61f93f02519ff3030ceb1c
+  msg:
+    appId: wxcf0fe8cdba153fd6
+    secrete: c33e06467c6879a62af633d50ed6b720
+    warnMsgTmpId: IZ-l9p9yBgcvhRR0uN6cBQPkWJ5i05zyWMkfeCPaAmY
 #
 spring:
  profiles:
@@ -34,7 +38,12 @@ netty:
    parent-group-threads: 10
    # 客户端的线程数
    child-group-threads: 10
-
+#分页配置
+pagehelper:
+  supportMethodsArguments: true
+  reasonable: false
+  helperDialect: mysql
+  params: count=countSql
 logging:
  level:
    # web日志
--- a/src/main/resources/mapper/TbProductMapper.xml
+++ b/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" />
@@ -73,21 +74,21 @@
    <result column="select_spec" jdbcType="LONGVARCHAR" property="selectSpec" />
  </resultMap>
  <sql id="Base_Column_List">
-    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
  </sql>
  <sql id="Blob_Column_List">
    images, video, notice, group_snap, spec_info, select_spec
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
-    select 
+    select
    <include refid="Base_Column_List" />
    ,
    <include refid="Blob_Column_List" />
@@ -99,51 +100,53 @@
    where id = #{id,jdbcType=INTEGER}
  </delete>
  <insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
-    insert into tb_product (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, 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, 
-      images, video, notice, 
-      group_snap, spec_info, select_spec
+    insert into tb_product (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, 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,
+      images, video, notice,
+      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}, 
-      #{shopId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{shortTitle,jdbcType=VARCHAR}, 
-      #{type,jdbcType=VARCHAR}, #{packFee,jdbcType=DECIMAL}, #{lowPrice,jdbcType=DECIMAL}, 
-      #{lowMemberPrice,jdbcType=DECIMAL}, #{unitId,jdbcType=VARCHAR}, #{unitSnap,jdbcType=VARCHAR}, 
-      #{coverImg,jdbcType=VARCHAR}, #{shareImg,jdbcType=VARCHAR}, #{videoCoverImg,jdbcType=VARCHAR}, 
-      #{sort,jdbcType=INTEGER}, #{limitNumber,jdbcType=INTEGER}, #{productScore,jdbcType=INTEGER}, 
-      #{status,jdbcType=TINYINT}, #{failMsg,jdbcType=VARCHAR}, #{isRecommend,jdbcType=TINYINT}, 
-      #{isHot,jdbcType=TINYINT}, #{isNew,jdbcType=TINYINT}, #{isOnSale,jdbcType=TINYINT}, 
-      #{isShow,jdbcType=TINYINT}, #{typeEnum,jdbcType=VARCHAR}, #{isDistribute,jdbcType=TINYINT}, 
-      #{isDel,jdbcType=TINYINT}, #{isStock,jdbcType=TINYINT}, #{isPauseSale,jdbcType=TINYINT}, 
-      #{isFreeFreight,jdbcType=TINYINT}, #{freightId,jdbcType=BIGINT}, #{strategyType,jdbcType=VARCHAR}, 
-      #{strategyId,jdbcType=INTEGER}, #{isVip,jdbcType=TINYINT}, #{isDelete,jdbcType=TINYINT}, 
-      #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, #{baseSalesNumber,jdbcType=DOUBLE}, 
-      #{realSalesNumber,jdbcType=INTEGER}, #{salesNumber,jdbcType=INTEGER}, #{thumbCount,jdbcType=INTEGER}, 
-      #{storeCount,jdbcType=INTEGER}, #{furnishMeal,jdbcType=INTEGER}, #{furnishExpress,jdbcType=INTEGER}, 
-      #{furnishDraw,jdbcType=INTEGER}, #{furnishVir,jdbcType=INTEGER}, #{isCombo,jdbcType=TINYINT}, 
-      #{isShowCash,jdbcType=TINYINT}, #{isShowMall,jdbcType=TINYINT}, #{isNeedExamine,jdbcType=TINYINT}, 
-      #{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}
+    values (#{id,jdbcType=INTEGER}, #{categoryId,jdbcType=VARCHAR}, #{specId,jdbcType=INTEGER},
+      #{sourcePath,jdbcType=VARCHAR}, #{brandId,jdbcType=INTEGER}, #{merchantId,jdbcType=VARCHAR},
+      #{shopId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{shortTitle,jdbcType=VARCHAR},
+      #{type,jdbcType=VARCHAR}, #{packFee,jdbcType=DECIMAL}, #{lowPrice,jdbcType=DECIMAL},
+      #{lowMemberPrice,jdbcType=DECIMAL}, #{unitId,jdbcType=VARCHAR}, #{unitSnap,jdbcType=VARCHAR},
+      #{coverImg,jdbcType=VARCHAR}, #{shareImg,jdbcType=VARCHAR}, #{videoCoverImg,jdbcType=VARCHAR},
+      #{sort,jdbcType=INTEGER}, #{limitNumber,jdbcType=INTEGER}, #{productScore,jdbcType=INTEGER},
+      #{status,jdbcType=TINYINT}, #{failMsg,jdbcType=VARCHAR}, #{isRecommend,jdbcType=TINYINT},
+      #{isHot,jdbcType=TINYINT}, #{isNew,jdbcType=TINYINT}, #{isOnSale,jdbcType=TINYINT},
+      #{isShow,jdbcType=TINYINT}, #{typeEnum,jdbcType=VARCHAR}, #{isDistribute,jdbcType=TINYINT},
+      #{isDel,jdbcType=TINYINT}, #{isStock,jdbcType=TINYINT}, #{isPauseSale,jdbcType=TINYINT},
+      #{isFreeFreight,jdbcType=TINYINT}, #{freightId,jdbcType=BIGINT}, #{strategyType,jdbcType=VARCHAR},
+      #{strategyId,jdbcType=INTEGER}, #{isVip,jdbcType=TINYINT}, #{isDelete,jdbcType=TINYINT},
+      #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, #{baseSalesNumber,jdbcType=DOUBLE},
+      #{realSalesNumber,jdbcType=INTEGER}, #{salesNumber,jdbcType=INTEGER}, #{thumbCount,jdbcType=INTEGER},
+      #{storeCount,jdbcType=INTEGER}, #{furnishMeal,jdbcType=INTEGER}, #{furnishExpress,jdbcType=INTEGER},
+      #{furnishDraw,jdbcType=INTEGER}, #{furnishVir,jdbcType=INTEGER}, #{isCombo,jdbcType=TINYINT},
+      #{isShowCash,jdbcType=TINYINT}, #{isShowMall,jdbcType=TINYINT}, #{isNeedExamine,jdbcType=TINYINT},
+      #{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},
+            #{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">
@@ -888,6 +913,12 @@
      where id = #{id,jdbcType=INTEGER}
  </update>

+  <update id="updateStockById">
+        update tb_product
+        set stock_number = stock_number - #{num,jdbcType=INTEGER}
+        where id = #{productId}
+  </update>
+
  <select id="selectByIdIn" resultMap="BaseResultMap">
    select *
    from tb_product
@@ -1025,4 +1056,4 @@
    group by `order`.pro_id
    ORDER BY number desc
  </select>
-</mapper>
+</mapper>
--- a/src/main/resources/mapper/TbProductSkuMapper.xml
+++ b/src/main/resources/mapper/TbProductSkuMapper.xml
@@ -23,21 +23,22 @@
    <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" />
    <result column="spec_snap" jdbcType="LONGVARCHAR" property="specSnap" />
  </resultMap>
  <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
+    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
  </sql>
  <sql id="Blob_Column_List">
    spec_info, spec_snap
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
-    select 
+    select
    <include refid="Base_Column_List" />
    ,
    <include refid="Blob_Column_List" />
@@ -54,22 +55,23 @@
    where id = #{id,jdbcType=INTEGER}
  </delete>
  <insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductSkuWithBLOBs">
-    insert into tb_product_sku (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, 
-      spec_info, spec_snap)
-    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}, 
-      #{guidePrice,jdbcType=DECIMAL}, #{strategyPrice,jdbcType=DECIMAL}, #{stockNumber,jdbcType=DOUBLE}, 
-      #{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})
+    insert into tb_product_sku (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,
+      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},
+      #{guidePrice,jdbcType=DECIMAL}, #{strategyPrice,jdbcType=DECIMAL}, #{stockNumber,jdbcType=DOUBLE},
+      #{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}),
+        #{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">
@@ -431,4 +444,4 @@
  </select>


-</mapper>
+</mapper>
--- a/src/main/resources/mapper/TbShopOpenIdMapper.xml
+++ b/src/main/resources/mapper/TbShopOpenIdMapper.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chaozhanggui.system.cashierservice.dao.TbShopOpenIdMapper">
+
+    <resultMap id="BaseResultMap" type="com.chaozhanggui.system.cashierservice.entity.TbShopOpenId">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="shopId" column="shop_id" jdbcType="INTEGER"/>
+            <result property="openId" column="open_id" jdbcType="VARCHAR"/>
+            <result property="status" column="status" jdbcType="TINYINT"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,shop_id,open_id,
+        status,create_time,update_time
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from tb_shop_open_id
+        where  id = #{id,jdbcType=INTEGER} 
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from tb_shop_open_id
+        where  id = #{id,jdbcType=INTEGER} 
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.chaozhanggui.system.cashierservice.entity.TbShopOpenId" useGeneratedKeys="true">
+        insert into tb_shop_open_id
+        ( id,shop_id,open_id
+        ,status,create_time,update_time
+        )
+        values (#{id,jdbcType=INTEGER},#{shopId,jdbcType=INTEGER},#{openId,jdbcType=VARCHAR}
+        ,#{status,jdbcType=TINYINT},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP}
+        )
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.chaozhanggui.system.cashierservice.entity.TbShopOpenId" useGeneratedKeys="true">
+        insert into tb_shop_open_id
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="id != null">id,</if>
+                <if test="shopId != null">shop_id,</if>
+                <if test="openId != null">open_id,</if>
+                <if test="status != null">status,</if>
+                <if test="createTime != null">create_time,</if>
+                <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="id != null">#{id,jdbcType=INTEGER},</if>
+                <if test="shopId != null">#{shopId,jdbcType=INTEGER},</if>
+                <if test="openId != null">#{openId,jdbcType=VARCHAR},</if>
+                <if test="status != null">#{status,jdbcType=TINYINT},</if>
+                <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+                <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbShopOpenId">
+        update tb_shop_open_id
+        <set>
+                <if test="shopId != null">
+                    shop_id = #{shopId,jdbcType=INTEGER},
+                </if>
+                <if test="openId != null">
+                    open_id = #{openId,jdbcType=VARCHAR},
+                </if>
+                <if test="status != null">
+                    status = #{status,jdbcType=TINYINT},
+                </if>
+                <if test="createTime != null">
+                    create_time = #{createTime,jdbcType=TIMESTAMP},
+                </if>
+                <if test="updateTime != null">
+                    update_time = #{updateTime,jdbcType=TIMESTAMP},
+                </if>
+        </set>
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.chaozhanggui.system.cashierservice.entity.TbShopOpenId">
+        update tb_shop_open_id
+        set 
+            shop_id =  #{shopId,jdbcType=INTEGER},
+            open_id =  #{openId,jdbcType=VARCHAR},
+            status =  #{status,jdbcType=TINYINT},
+            create_time =  #{createTime,jdbcType=TIMESTAMP},
+            update_time =  #{updateTime,jdbcType=TIMESTAMP}
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+</mapper>
--- a/src/main/resources/mapper/TbUserShopMsgMapper.xml
+++ b/src/main/resources/mapper/TbUserShopMsgMapper.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chaozhanggui.system.cashierservice.dao.TbUserShopMsgMapper">
+  <resultMap id="BaseResultMap" type="com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg">
+    <id column="shop_id" jdbcType="INTEGER" property="shopId" />
+    <result column="open_id" jdbcType="VARCHAR" property="openId" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    shop_id, open_id, remark, status, create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tb_user_shop_msg
+    where shop_id = #{shopId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tb_user_shop_msg
+    where shop_id = #{shopId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg">
+    insert into tb_user_shop_msg (shop_id, open_id, remark,
+      status, create_time, update_time
+      )
+    values (#{shopId,jdbcType=INTEGER}, #{openId,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
+      #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg">
+    insert into tb_user_shop_msg
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="shopId != null">
+        shop_id,
+      </if>
+      <if test="openId != null">
+        open_id,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="shopId != null">
+        #{shopId,jdbcType=INTEGER},
+      </if>
+      <if test="openId != null">
+        #{openId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg">
+    update tb_user_shop_msg
+    <set>
+      <if test="openId != null">
+        open_id = #{openId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where shop_id = #{shopId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg">
+    update tb_user_shop_msg
+    set open_id = #{openId,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      status = #{status,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where shop_id = #{shopId,jdbcType=INTEGER}
+  </update>
+</mapper>