Merge remote-tracking branch 'origin/v2' into v2

soss-system/src/main/java/com/soss/system/service/impl/ShopServiceImpl.java

@@ -299,6 +299,13 @@ public class ShopServiceImpl implements IShopService {
                     goods.setPreferential("0");
                 }
                 goods.setSalesVolume(orderMapper.selectSalesVolume(shopId, goods.getId()));
+
+                GoodsTag goodsTag = new GoodsTag();
+                goodsTag.setState("1");
+                goodsTag.setGoodsId(goods.getId());
+                List<GoodsTag> goodsTags = goodsTagMapper.selectGoodsTagList(goodsTag);
+                List<String> tags = goodsTags.stream().map(GoodsTag::getTag).collect(Collectors.toList());
+                goods.setGoodsTagList(tags);
             }
             category.setGoodsList(goodsList);
         }

soss-system/src/main/resources/mapper/system/ShopGoodsMapper.xml

@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         g.code,
         '1' as state,
         case when sr.id>0 then 1 else 0 end as isRecommend,
+        sr.recommend_price,
         sr.recommend_tag
         from goods g
         LEFT JOIN shop_goods sg ON g.id = sg.goods_id