Merge branch 'dev' into 'test'

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/mapper/OprationFloorGoodsMapper.java

@@ -17,8 +17,8 @@ import java.util.List;
  * @since 2021-04-02
  */
 public interface OprationFloorGoodsMapper extends BaseMapper<OprationFloorGoods> {
-    @Select("select * from goods_spu a left join opration_floor_goods b on a.goods_id = b.goods_id  where b.operation_floor_id = #{operationFloorId} and a.status = 1 and b.status = 0 order by display_order asc limit ${start},${end}")
+    @Select("select * from goods_spu a left join opration_floor_goods b on a.goods_id = b.goods_id  where b.operation_floor_id = #{operationFloorId} and a.status in (1, 10) and b.status = 0 order by display_order asc limit ${start},${end}")
     List<SaleHotVo> getList(@Param("operationFloorId") String operationFloorId, @Param("start") int start, @Param("end")int end);
-    @Select("select count(*) from goods_spu a left join opration_floor_goods b on a.goods_id = b.goods_id where b.operation_floor_id = #{operationFloorId} and a.status = 1 and b.status = 0")
+    @Select("select count(*) from goods_spu a left join opration_floor_goods b on a.goods_id = b.goods_id where b.operation_floor_id = #{operationFloorId} and a.status in (1, 10) and b.status = 0")
     Integer getCount(@Param("operationFloorId") String operationFloorId);
 }