Merge remote-tracking branch 'remote-v2/master-v2' into master-v2

xuxueyang

2024-09-24 272188e47087a8ef92eb0a48b122fa1c73ea94d3

 src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java

@@ -50,5 +50,6 @@
            "LEFT JOIN t_customer_info c ON t1.create_by = c.user_id ")
    List<Order> getOrderInfoByReceiveTime();

    Integer getFlowerCompleteNumToday(@Param("userId") String userId,@Param("flowerId") Long flowerId);
    int getFlowerCompleteNumWithinTimeRange(@Param("userId") String userId ,@Param("flowerId") Long flowerId,
                                            @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
}