需求

src/main/java/com/gree/mall/miniapp/commonmapper/GoodsSpecDetailMapper.java

@@ -62,7 +62,7 @@ public interface GoodsSpecDetailMapper {
                                              @Param("keyword") String keyword,
                                              @Param("categoryId") String categoryId,
                                              @Param("sort") Integer sort,
-                                             @Param("companyWechatId") String companyWechatId);
+                                             @Param("goodsList") List<String> goodsList);
 
 
 }

src/main/java/com/gree/mall/miniapp/logic/goods/GoodsLogic.java

@@ -78,6 +78,9 @@ public class GoodsLogic {
     @Autowired
     GoodsTagRelaService goodsTagrelaService;
 
+    @Autowired
+    GoodsCompanyService goodsCompanyService;
+
     /**
      * 商品列表
      *
@@ -89,9 +92,15 @@ public class GoodsLogic {
     public IPage<GoodsNewBean> page(HttpServletRequest request,String keyword,String categoryId, Integer sort,Integer pageNum, Integer pageSize) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
 
+        List<GoodsCompany> list = goodsCompanyService.lambdaQuery()
+                .eq(GoodsCompany::getCompanyId, currentCompanyWechat.getUser().getCompanyId())
+                .select(GoodsCompany::getGoodsId).list();
+
+        List<String> goodsList = list.stream().map(GoodsCompany::getGoodsId).collect(Collectors.toList());
+
         IPage<GoodsNewBean> page = goodsSpecDetailMapper.queryGoodsList(new Page(pageNum, pageSize),
                 currentCompanyWechat.getUser().getUserId(), currentCompanyWechat.getUser().getType(),
-                keyword, categoryId,sort,null);
+                keyword, categoryId,sort,goodsList);
 
         this.supplyGoodsNewBean(page,currentCompanyWechat);
         return page;

src/main/resources/mapper/GoodsSpecDetailMapper.xml

@@ -134,6 +134,13 @@
 				<if test="keyword != null and keyword != ''">
                     and a.goods_name like concat('%',#{keyword},'%')
                 </if>
+
+        <if test=' goodsList != null and goodsList.size > 0' >
+            and a.goods_id in
+            <foreach collection="goodsList" open="(" close=")" item="goods" separator=",">
+                #{goods}
+            </foreach>
+        </if>
                 <if test="categoryId != null and categoryId !=''">
                     and a.category_id = #{categoryId}
                 </if>