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

陶杰

2024-11-14 d94e7d6bbf23698c27147a60ee866c64b2d43775

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

@@ -374,8 +374,8 @@
    <select id="getOrderSaleAmount" resultType="java.math.BigDecimal">
        SELECT sum(o.payment_amount)
        FROM t_order o
        WHERE o.payment_time is not null
        and o.refund_time is null
        WHERE o.deleted=0
        and o.status_backend not in ('PENDING','CANCEL','REFUND')
        <if test="startTime != null">
            and o.create_time &gt; #{startTime}
        </if>