|
@@ -38,6 +38,7 @@ import com.sqx.modules.goods.service.GoodsAttrValueService;
|
|
|
import com.sqx.modules.goods.service.GoodsService;
|
|
import com.sqx.modules.goods.service.GoodsService;
|
|
|
import com.sqx.modules.goods.service.GoodsSkuService;
|
|
import com.sqx.modules.goods.service.GoodsSkuService;
|
|
|
import com.sqx.modules.goods.utils.SkuUtil;
|
|
import com.sqx.modules.goods.utils.SkuUtil;
|
|
|
|
|
+import com.sqx.modules.goods.vo.GoodsListVo;
|
|
|
import com.sqx.modules.goods.vo.GoodsVo;
|
|
import com.sqx.modules.goods.vo.GoodsVo;
|
|
|
import com.sqx.modules.order.entity.Evaluate;
|
|
import com.sqx.modules.order.entity.Evaluate;
|
|
|
import com.sqx.modules.shop.dao.ShopMessageDao;
|
|
import com.sqx.modules.shop.dao.ShopMessageDao;
|
|
@@ -182,7 +183,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsDao, Goods> implements Go
|
|
|
for (int i = 0; i < goodsClassifies.size(); i++) {
|
|
for (int i = 0; i < goodsClassifies.size(); i++) {
|
|
|
Map<String, Object> hashMap = new HashMap<>();
|
|
Map<String, Object> hashMap = new HashMap<>();
|
|
|
GoodsClassify goodsClassify = goodsClassifies.get(i);
|
|
GoodsClassify goodsClassify = goodsClassifies.get(i);
|
|
|
- List<Goods> goodsList1 = goodsDao.selectGoodsByClassify(goodsClassify.getClassifyId(), shopId);
|
|
|
|
|
|
|
+// List<Goods> goodsList1 = goodsDao.selectGoodsByClassify(goodsClassify.getClassifyId(), shopId);
|
|
|
|
|
+ List<GoodsListVo> goodsList1 = goodsDao.selectGoodsVoByClassify(goodsClassify.getClassifyId(), shopId);
|
|
|
hashMap.put("classifyId", goodsClassifies.get(i).getClassifyId());
|
|
hashMap.put("classifyId", goodsClassifies.get(i).getClassifyId());
|
|
|
hashMap.put("classifyName", goodsClassify.getClassifyName());
|
|
hashMap.put("classifyName", goodsClassify.getClassifyName());
|
|
|
hashMap.put("goodsList", goodsList1);
|
|
hashMap.put("goodsList", goodsList1);
|