Merge branch 'dev' into 'test'

mall-server-admin/src/main/resources/mapper/opration/FloorGoodsMapper.xml

@@ -18,7 +18,7 @@
                s.name, s.description, s.thumb
         from opration_floor_goods f
         left join goods_spu s on f.goods_id = s.goods_id
-        where f.operation_floor_id = #{operationFloorId} and f.status = false and s.status = 1
+        where f.operation_floor_id = #{operationFloorId} and f.status = false and s.status in (1, 10)
         order by f.display_order asc, f.update_time desc
     </select>
 </mapper>

mall-server-front/src/main/resources/mapper/goods/SpuMapper.xml

@@ -4,17 +4,17 @@
 
     <select id="getByCategoryId" resultType="com.fzm.mall.server.front.goods.model.vo.GoodsVo">
         select a.*,c.shop_name as merchantName,c.* from goods_spu a left join goods_count b on a.goods_id = b.goods_id left join  shop c on a.merchant_id = c.merchant_id
-        left join goods_category_spu d on d.goods_id = a.goods_id where d.category_id = #{categoryId}  and a.status = 1 order by a.default_price ${price},b.sales ${sale},a.create_time desc limit ${start},${end};
+        left join goods_category_spu d on d.goods_id = a.goods_id where d.category_id = #{categoryId}  and a.status in (1,10) order by a.default_price ${price},b.sales ${sale},a.create_time desc limit ${start},${end};
     </select>
 
     <select id="getSearch" resultType="com.fzm.mall.server.front.goods.model.vo.GoodsVo">
         select a.*,c.shop_name as merchantName,c.* from goods_spu a left join goods_count b on a.goods_id = b.goods_id left join  shop c on a.merchant_id = c.merchant_id
-        where a.name like  #{searchKey} and a.status = 1 order by a.default_price ${price},b.sales ${sale},a.create_time desc limit ${start},${end};
+        where a.name like  #{searchKey} and a.status in (1,10) order by a.default_price ${price},b.sales ${sale},a.create_time desc limit ${start},${end};
     </select>
 
     <select id="getByGoodsId" resultType="com.fzm.mall.server.front.goods.model.vo.GoodsVo">
         select a.*,c.shop_name as merchantName,c.* from goods_spu a left join goods_count b on a.goods_id = b.goods_id left join  shop c on a.merchant_id = c.merchant_id
-        where a.goods_id = #{goodsId}  and a.status = 1;
+        where a.goods_id = #{goodsId}  and a.status in (1, 10);
     </select>
 
     <select id="getByCategoryIdCount" resultType="integer">
@@ -23,6 +23,6 @@
         left join goods_count b on a.goods_id = b.goods_id
         left join  merchant c on a.merchant_id = c.merchant_id
         left join goods_category_spu d on d.goods_id = a.goods_id
-        where d.category_id = #{categoryId}  and a.status = 1
+        where d.category_id = #{categoryId}  and a.status in (1, 10)
     </select>
 </mapper>