1.统计报表-历史合伙人可查 2.小程序-花店：分类按照售罄放到最下面 3.小程序-合伙人：质检按照仓库排序

陶杰

2024-12-25 e2af8608c0d243c6ec061791197fd446b4401b8a

1.统计报表-历史合伙人可查
2.小程序-花店：分类按照售罄放到最下面
3.小程序-合伙人：质检按照仓库排序

 src/main/resources/mapper/flower/FlowerMapper.xml

@@ -198,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>

 src/main/resources/mapper/payment/DeliveryOrderMapper.xml

@@ -164,6 +164,8 @@
        join t_order o on q.order_id = o.id
        join t_supplier_info s on s.id = q.supplier_id
        join t_station st on st.id = s.station_id
        left join t_warehouse w on o.warehouse_id=w.id
        left join t_warehouse_location wl on o.warehouse_location_id=wl.id
        WHERE q.deleted = 0 and o.deleted = 0
        and q.status in ('PENDING', 'ARRIVED', 'CHECKED')
        AND q.supplier_id = #{condition.supplierId}
@@ -205,8 +207,8 @@
        <if test="condition.endDate != null">
            AND o.payment_time &lt; #{condition.endDate}
        </if>

        ORDER BY q.arrive_time
        order by w.seq,wl.seq asc
        <!-- ORDER BY q.arrive_time -->
    </select>

    <select id="statisticStationList" resultType="com.mzl.flower.dto.response.flower.StationStatisticDTO">

 src/main/resources/mapper/report/OrderReportMapper.xml

@@ -47,9 +47,7 @@
            and o.payment_time &lt; #{dto.endDate}
        </if>
        <if test="dto.partnerId != null">
            and o.create_by in (
            select user_id from t_customer_info where partner_id=#{dto.partnerId}
            )
            and o.partner_id=#{dto.partnerId}
        </if>
        ) t

@@ -96,9 +94,7 @@
                    and o.payment_time &lt; #{dto.endDate}
                </if>
                <if test="dto.partnerId != null">
                    and o.create_by in (
                        select user_id from t_customer_info where partner_id=#{dto.partnerId}
                    )
                    and o.partner_id=#{dto.partnerId}
                </if>
        ) t

@@ -130,9 +126,7 @@
            and o.payment_time &lt; #{dto.endDate}
        </if>
        <if test="dto.partnerId != null">
            and o.create_by in (
            select user_id from t_customer_info where partner_id=#{dto.partnerId}
            )
            and o.partner_id=#{dto.partnerId}
        </if>
    </select>

@@ -159,9 +153,7 @@
            and o.payment_time &lt; #{dto.endDate}
        </if>
        <if test="dto.partnerId != null">
            and o.create_by in (
            select user_id from t_customer_info where partner_id=#{dto.partnerId}
            )
            and o.partner_id=#{dto.partnerId}
        </if>
    </select>