From ddca8e96ee1aa47ba33fcf3a9a1e7e964d63ad8b Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期四, 31 十月 2024 17:15:43 +0800 Subject: [PATCH] fix: 钱包供应商财务1 --- src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java b/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java index 1d0f7a6..5c4ca5e 100644 --- a/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java +++ b/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @@ -43,9 +44,33 @@ "JOIN ( " + " SELECT create_by, MAX(receive_time) AS max_time " + " FROM t_order " + - " where receive_time is not null and DATE(receive_time) < DATE(NOW()) - INTERVAL 30 DAY" + + " where receive_time is not null " + " GROUP BY create_by " + + " HAVING max_time < NOW() - INTERVAL 30 DAY " + ") t2 ON t1.create_by = t2.create_by AND t1.receive_time = t2.max_time " + "LEFT JOIN t_customer_info c ON t1.create_by = c.user_id ") List<Order> getOrderInfoByReceiveTime(); + + int getFlowerCompleteNumWithinTimeRange(@Param("userId") String userId ,@Param("flowerId") Long flowerId, + @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime); + + List<OrderListExportDTO> selectOrderExportList(@Param("condition") OrderQueryDTO dto); + + + @Select("SELECT si.contact_tel " + + "FROM t_supplier_info si " + + "WHERE si.id IN ( " + + " SELECT oi.supplier_id " + + " FROM t_order_item oi " + + " JOIN t_order q ON oi.order_id = q.id " + + " WHERE q.deleted = 0 " + + " AND q.status_backend = #{Status} " + + " AND q.payment_time >= #{startTime} " + + " AND q.payment_time <= #{endTime} " + + " GROUP BY oi.supplier_id " + + ")") + List<String> getWaitSendMessageInfoBySupplier(String Status, LocalDateTime startTime, LocalDateTime endTime); + + BigDecimal getOrderSaleAmount(@Param("startTime") LocalDateTime startTime + , @Param("endTime") LocalDateTime endTime); } -- Gitblit v1.9.3