Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-06-29 efa01b099eaaa263a3745cc11445d41c64c95306

Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

 gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml

@@ -40,7 +40,8 @@
        select
            a.*,
            sum(b.quantity) quantity,
            sum(b.stock) stock
            sum(b.stock) stock,
            max(b.present_price) maxPrice
        from xzx_score_goods a
        inner join xzx_score_goods_sku b on a.id=b.goods_id and b.del_flag=0
        <where>
@@ -66,7 +67,7 @@
            order by quantity desc
        </if>
        <if test="record.sort == 3">
            order by a.present_price desc
            order by maxPrice desc
        </if>
    </select>