From 55255f6b9f81b8a3fdd576b27cda5c34fbb7ba0a Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 12 九月 2024 17:39:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 8068b0d..1d0f7a6 100644
--- a/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
@@ -6,6 +6,7 @@
import com.mzl.flower.dto.response.payment.*;
import com.mzl.flower.entity.payment.Order;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.time.LocalDateTime;
@@ -36,4 +37,15 @@
Order getUserLastOrder(@Param("userId") String userId);
List<OrderPointGoodsListDTO> getPointGoodsList(@Param("orderId") String orderId);
+
+ @Select("SELECT t1.* " +
+ "FROM t_order t1 " +
+ "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" +
+ " GROUP BY create_by " +
+ ") 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();
}
--
Gitblit v1.9.3