From 6424048caa1ceb3fe5ad31a68fb6eec69bbed6d2 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 九月 2024 11:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 b4a9410..1d0f7a6 100644
--- a/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
@@ -3,12 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.dto.request.payment.OrderQueryDTO;
-import com.mzl.flower.dto.response.payment.OrderCheckListDTO;
-import com.mzl.flower.dto.response.payment.OrderListDTO;
-import com.mzl.flower.dto.response.payment.OrderStatusCountDTO;
-import com.mzl.flower.dto.response.payment.SupplierNumDTO;
+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;
@@ -17,6 +15,8 @@
@Repository
public interface OrderMapper extends BaseMapper<Order> {
void setPartnerOrderReceive();
+
+ List<Order> getPartnerOrderReceive();
List<OrderStatusCountDTO> getOrderStatusCount(@Param("condition") OrderQueryDTO dto);
@@ -33,4 +33,19 @@
List<Order> getOrderForBill(@Param("startTime")LocalDateTime startTime
, @Param("endTime")LocalDateTime endTime);
+
+ 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