diff --git a/src/main/resources/mapper/ShopProductBaseMapper.xml b/src/main/resources/mapper/ShopProductBaseMapper.xml
index 700df65314191027eac3e964ef5e94dc18da4c52..8d1f0edef0cd19b86e6a7f6d35ca2970d8f144d6 100644
--- a/src/main/resources/mapper/ShopProductBaseMapper.xml
+++ b/src/main/resources/mapper/ShopProductBaseMapper.xml
@@ -24,6 +24,9 @@
       pb.spu,pb.comment2,pb.category_id,pb.name,pv.image,pv.price,pv.sku
     </sql>
 
+    <sql id="available_column">
+      pv.sku,pv.spu,pv.price,pv.image,pv.sku_name,pb.weight,pb.category_id,st.lock
+    </sql>
     <select id="getAllGoods" parameterType="java.lang.String" resultType="java.util.Map">
       select
       <include refid="base_column" />
@@ -50,27 +53,32 @@
     </select>
 
   <select id="getGuessLikeGoods" parameterType="java.lang.String" resultType="java.util.Map">
-    select
-    <include refid="base_column" />
-    from  shop_product_variant pv
-    left join shop_product_base pb on pv.spu=pb.spu
-    group by pb.spu
+    SELECT a.* from (
+      SELECT
+       <include refid="available_column" />
+      FROM
+        shop_product_variant pv
+      LEFT JOIN shop_product_base pb ON pv.spu = pb.spu
+      LEFT JOIN shop_stock st ON pv.sku = st.sku
+      ORDER BY price ASC limit 10000000
+      )a
+    GROUP BY a.spu
     order by
-      <if test="order != null and order != ''">
-        <if test="order==&quot;1&quot;">
-          pb.weight desc,
-        </if>
-        <if test="order==&quot;2&quot;">
-          pb.comment2*1 desc,
-        </if>
-        <if test="order==&quot;3&quot;">
-          pv.price asc,
-        </if>
-        <if test="order==&quot;4&quot;">
-          pv.price desc,
-        </if>
+    <if test="order != null and order != ''">
+      <if test="order==&quot;1&quot;">
+        a.weight desc,
+      </if>
+      <if test="order==&quot;2&quot;">
+        a.lock*1 desc,
+      </if>
+      <if test="order==&quot;3&quot;">
+        a.price asc,
       </if>
-       pb.weight desc
+      <if test="order==&quot;4&quot;">
+        a.price desc,
+      </if>
+    </if>
+    a.weight desc
     <if test="start != null and rows != null">
       limit #{start},#{rows}
     </if>
@@ -97,10 +105,11 @@
 
   <select id="getTargrtGroupGoods" parameterType="java.lang.String" resultType="java.util.Map">
     select
-    <include refid="base_column" />
+    <include refid="available_column" />
     from  shop_product_variant pv
       left join shop_product_base pb on pv.spu=pb.spu
       left join shop_category c on pb.category_id=c.id
+      LEFT join shop_stock st on pv.sku=st.sku
     <if test="cid != null and cid != ''">
       where
       c.comment1 like '%-${cid}-%'
@@ -112,7 +121,7 @@
           pb.weight desc,
         </if>
         <if test="order==&quot;2&quot;">
-          pb.comment2*1 desc,
+          st.lock*1 desc,
         </if>
         <if test="order==&quot;3&quot;">
           pv.price asc,
@@ -133,6 +142,7 @@
         from  shop_product_variant pv
         left join shop_product_base pb on pv.spu=pb.spu
         left join shop_category c on pb.category_id=c.id
+        LEFT join shop_stock st on pv.sku=st.sku
         <if test="cid != null and cid != ''">
             where
             c.comment1 like '%-${cid}-%'
@@ -144,7 +154,7 @@
                 pb.weight desc,
             </if>
             <if test="order==&quot;2&quot;">
-                pb.comment2*1 desc,
+                st.lock*1 desc,
             </if>
             <if test="order==&quot;3&quot;">
                 pv.price asc,