Merge remote-tracking branch 'origin/master-v4' into master-v4

陶杰

2024-11-14 d94e7d6bbf23698c27147a60ee866c64b2d43775

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

@@ -58,4 +58,31 @@
        WHERE oi.deleted = 0
        and oi.order_id = #{orderId}
    </select>

    <select id="getOrderItems" resultType="com.mzl.flower.dto.response.payment.OrderItemListDTO">
        SELECT oi.*
        , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace' and oic.audit_status = 'AGREED') replaceNum
        , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce' and oic.audit_status = 'AGREED') reduceNum
        , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack' and oic.audit_status = 'AGREED') lackNum
        FROM t_order_item oi
        WHERE oi.deleted = 0
        and oi.order_id in
        <foreach collection="orderIds" item="orderId" open="(" separator="," close=")">
            #{orderId}
        </foreach>
    </select>

    <select id="getFlowerSaleNum" resultType="java.lang.Integer">
        SELECT sum(oi.num)
        FROM t_order_item oi
        JOIN t_order o on oi.order_id = o.id
        WHERE o.deleted=0
        and o.status_backend not in ('PENDING','CANCEL','REFUND')
        <if test="startTime != null">
            and o.create_time &gt; #{startTime}
        </if>
        <if test="endTime != null">
            and o.create_time &lt;= #{endTime}
        </if>
    </select>
</mapper>