src/main/resources/mapper/flower/FlowerMapper.xml
@@ -180,8 +180,11 @@
        <choose>
            <when test="condition.column != null and condition.column != '' and (condition.recommend == null or condition.zoneId != null)">
                <choose>
                    <when test="'f.sales'.equals(condition.column) or 'f.stock'.equals(condition.column)">
                        order by ${condition.column} desc
                    <when test="'f.sales'.equals(condition.column)">
                        order by ifnull(f.sales, 0) + ifnull(f.real_sales, 0) desc
                    </when>
                    <when test="'f.stock'.equals(condition.column)">
                        order by f.stock desc
                    </when>
                    <otherwise>
                        order by ${condition.column}, f.price
@@ -195,7 +198,9 @@
                order by fzp.rank asc
            </when>
            <otherwise>
                order by f.price asc
                order by
                    CASE WHEN f.stock = 0 THEN 1  ELSE 0 END,
                f.price asc
            </otherwise>
        </choose>
    </select>
@@ -332,8 +337,11 @@
        <choose>
            <when test="condition.column != null and condition.column != ''">
                <choose>
                    <when test="'f.sales'.equals(condition.column) or 'f.stock'.equals(condition.column)">
                        order by ${condition.column} desc
                    <when test="'f.sales'.equals(condition.column)">
                        order by ifnull(f.sales, 0) + ifnull(f.real_sales, 0) desc
                    </when>
                    <when test="'f.stock'.equals(condition.column)">
                        order by f.stock desc
                    </when>
                    <otherwise>
                        order by ${condition.column} asc
@@ -409,7 +417,7 @@
    <update id="updateFlowerCategoryInfo">
        update t_flower f, t_flower_category fc
        set f.unit = fc.unit, f.color = fc.color
        set f.unit = fc.unit, f.color = fc.color,f.name=fc.name
        where f.category = fc.id and fc.id = #{category}
    </update>
    <update id="updateBatchTypeRank">