## 新商品列表接口添加入参处理；

bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/api/ApiIndexController.java

@@ -16,6 +16,7 @@ import com.hzs.common.domain.sale.wares.ext.WaresGradeAwards;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.member.base.IMemberServiceApi;
 import com.hzs.member.base.dto.ShowWaresDTO;
+import com.hzs.sale.index.controller.param.IndexWaresParam;
 import com.hzs.sale.wares.service.IBdWaresGradeService;
 import com.hzs.sale.wares.service.IBdWaresRangeService;
 import com.hzs.sale.wares.service.IBdWaresService;
@@ -55,17 +56,22 @@ public class ApiIndexController extends BaseController {
     /**
      * 首页商品列表
      *
+     * @param param
      * @return
      */
     @GetMapping("/index-wares-list")
-    public TableDataInfo indexWaresList() {
+    public TableDataInfo indexWaresList(IndexWaresParam param) {
         Long pkMember = SecurityUtils.getUserId();
-
         // 返回数据列表
         List<WaresVo> waresVOList = new ArrayList<>();
 
+        if (CollectionUtil.isEmpty(param.getSpecialAreaList())) {
+            // 如果没有传入专区，则使用默认商品专区
+            param.setSpecialAreaList(Arrays.asList(ESpecialArea.REPURCHASE_AREA.getValue(), ESpecialArea.SPECIAL_REPURCHASE_AREA.getValue(), ESpecialArea.RESCISSION_AREA.getValue()));
+        }
+
         // 商品列表
-        List<BdWaresExt> waresList = iBdWaresService.listWares(Arrays.asList(ESpecialArea.REPURCHASE_AREA.getValue(), ESpecialArea.SPECIAL_REPURCHASE_AREA.getValue(), ESpecialArea.RESCISSION_AREA.getValue()));
+        List<BdWaresExt> waresList = iBdWaresService.listWares(param);
         if (CollectionUtil.isNotEmpty(waresList)) {
             // 获取商品ID列表
             List<Integer> waresIdList = waresList.stream().map(BdWares::getPkId).collect(Collectors.toList());

bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/param/IndexWaresParam.java

@@ -0,0 +1,23 @@
+package com.hzs.sale.index.controller.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 首页商品查询入参
+ */
+@Data
+public class IndexWaresParam {
+
+    /**
+     * 是否推荐（0=是，1=否）
+     */
+    private Integer isRecommend;
+
+    /**
+     * 商品专区列表
+     */
+    private List<Integer> specialAreaList;
+
+}

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.sale.ext.BdWaresExt;
 import com.hzs.common.domain.sale.wares.BdWares;
 import com.hzs.common.domain.system.config.BdAgreement;
+import com.hzs.sale.index.controller.param.IndexWaresParam;
 import com.hzs.sale.wares.param.WaresParams;
 import com.hzs.sale.wares.vo.WaresAuthorityVo;
 import com.hzs.sale.wares.vo.WaresVo;
@@ -151,9 +152,9 @@ public interface BdWaresMapper extends BaseMapper<BdWares> {
     /**
      * 新商品列表
      *
-     * @param specialAreaList
+     * @param param
      * @return
      */
-    List<BdWaresExt> listWaresNew(@Param("specialAreaList") List<Integer> specialAreaList);
+    List<BdWaresExt> listWaresNew(@Param("param") IndexWaresParam param);
 
 }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java

@@ -6,6 +6,7 @@ import com.hzs.common.domain.sale.wares.BdWares;
 import com.hzs.common.domain.sale.wares.BdWaresAuthority;
 import com.hzs.common.domain.system.config.BdAgreement;
 import com.hzs.common.domain.system.config.ext.BdRangeExt;
+import com.hzs.sale.index.controller.param.IndexWaresParam;
 import com.hzs.sale.wares.param.ComputeWaresPrice;
 import com.hzs.sale.wares.param.WaresParams;
 import com.hzs.sale.wares.vo.RecommendWaresInfoVo;
@@ -213,9 +214,9 @@ public interface IBdWaresService extends IService<BdWares> {
     /**
      * 新商品列表
      *
-     * @param specialAreaList
+     * @param param
      * @return
      */
-    List<BdWaresExt> listWares(List<Integer> specialAreaList);
+    List<BdWaresExt> listWares(IndexWaresParam param);
 
 }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java

@@ -26,6 +26,7 @@ import com.hzs.common.domain.system.config.BdMenuDetail;
 import com.hzs.common.domain.system.config.ext.BdRangeExt;
 import com.hzs.member.base.IMemberServiceApi;
 
+import com.hzs.sale.index.controller.param.IndexWaresParam;
 import com.hzs.sale.product.service.IBdSpecsService;
 import com.hzs.sale.wares.param.*;
 import com.hzs.common.security.utils.SecurityUtils;
@@ -1617,9 +1618,8 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
     }
 
     @Override
-    public List<BdWaresExt> listWares(List<Integer> specialAreaList) {
+    public List<BdWaresExt> listWares(IndexWaresParam param) {
-        // 商品列表（复购、乐学复购、重消）
+        return baseMapper.listWaresNew(param);
-        return baseMapper.listWaresNew(specialAreaList);
 
     }
 

bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml

@@ -414,9 +414,12 @@
         where bd.del_flag = 0
         and bd.wares_status = 5
         and bwe.is_put_on = 0
-        <if test="specialAreaList != null">
+        <if test="param.isRecommend != null">
+            and bd.is_recommend = #{param.isRecommend}
+        </if>
+        <if test="param.specialAreaList != null and param.specialAreaList.size > 0">
             and bd.special_area in
-            <foreach collection="specialAreaList" item="item" open="(" close=")" separator=",">
+            <foreach collection="param.specialAreaList" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>