From 66b02aac92f89c9d5df3e75d6d342634092f0dd4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Nov 2021 15:07:56 +0800
Subject: [PATCH] 20211108

---
 gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
index 69b54b3..69b6199 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
@@ -103,9 +103,18 @@
     public Map<String, Object> queryGoodsList(QueryGoodsListDto model) {
         String name = model.getName() == null ? "":model.getName();
         int delFlag = model.getDelFlag() == null ? 2:model.getDelFlag();
+        int namePx = model.getNamePx() == null ? 7:model.getNamePx();
+        int typePx = model.getTypePx() == null ? 2:model.getTypePx();
         PageHelper.startPage(model.getPage(), model.getLimit());
 
-        List<QueryGoodsListVo> maps = scoreGoodsMapper.queryGoodsList(name,delFlag);
+        List<QueryGoodsListVo> maps = scoreGoodsMapper.queryGoodsList(name,delFlag,model.getIsQg(),model.getIsSale(),namePx,typePx);
+//        if(CollUtil.isNotEmpty(maps)){
+//            for(QueryGoodsListVo queryGoodsListVo : maps){
+//                long id = queryGoodsListVo.getId();
+//                Integer stock = scoreGoodsSkuMapper.selectScoreGoodsSkuMapperByGoodId(id);
+//                queryGoodsListVo.setStock(stock);
+//            }
+//        }
         PageInfo pageInfo = new PageInfo(maps);
         int count = Convert.toInt(pageInfo.getTotal());
         Map<String, Object> map = new HashMap<>();

--
Gitblit v1.9.1