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

Helius

2021-08-09 00a8e2f76d02cfc17ca9ff156aa97f85bae5897d

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

@@ -8,6 +8,7 @@
        a.CREATED_TIME createTime
        FROM
        xzx_score_goods a

        WHERE 1 = 1
        <if test="name != null and name != ''">
            and (a.name like concat('%',#{name},'%') or a.goods_no like concat('%',#{name},'%'))
@@ -40,11 +41,18 @@
        select
            a.*,
            sum(b.quantity) quantity,
            sum(b.stock) stock
            sum(b.stock) stock,
            min(b.present_price) minPrice
        from xzx_score_goods a
        inner join xzx_score_goods_sku b on a.id=b.goods_id and b.del_flag=0
        <where>
            a.del_flag=0 and a.is_sale=1
            <if test="record.minScore != null" >
                and b.present_price >= #{record.minScore}
            </if>
            <if test="record.maxScore != null">
                and #{record.maxScore} > b.present_price
            </if>
            <if test="record.name != null and record.name != ''">
                and a.name like concat('%',#{record.name},'%')
            </if>
@@ -66,7 +74,7 @@
            order by quantity desc
        </if>
        <if test="record.sort == 3">
            order by a.present_price desc
            order by minPrice desc
        </if>
    </select>