From 3c5723e2b832823fc63e6d8cd1460b2e003583db Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 29 九月 2025 17:16:38 +0800
Subject: [PATCH] 抽奖活动添加次数规则

---
 framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
index 80f5579..238bbc7 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
@@ -13,7 +13,9 @@
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 璁㈠崟鏁版嵁澶勭悊灞�
@@ -61,7 +63,8 @@
             "o.logistics_time AS logistics_time," +
             "o.complete_time AS complete_time," +
             "o.store_name AS store_name, " +
-            "m.nick_name AS nickName" +
+            "m.nick_name AS nickName," +
+            "o.member_id AS memberId" +
             " FROM li_order o LEFT JOIN li_order_item oi ON oi.order_sn = o.sn " +
             "LEFT JOIN li_member m on m.id = o.member_id " +
             "${ew.customSqlSegment}")
@@ -141,8 +144,8 @@
      * @param queryWrapper 鏌ヨ鏉′欢
      * @return 绠�鐭鍗曞垎椤�
      */
-    @Select("select o.sn,o.flow_price,o.create_time,o.order_status,o.pay_status,o.payment_method,o.payment_time,o.member_name,o.store_name as " +
-            "store_name,o.store_id as store_id,o.client_type,o.order_type,o.deliver_status,o.order_promotion_type,o.seller_remark " +
+    @Select("select o.id,o.sn,o.flow_price,o.create_time,o.order_status,o.pay_status,o.payment_method,o.payment_time,o.member_name,o.store_name as " +
+            "store_name,o.store_id as store_id,o.client_type,o.order_type,o.deliver_status,o.order_promotion_type,o.seller_remark,o.coupon_flag " +
             ",GROUP_CONCAT(oi.goods_id) as group_goods_id," +
             " GROUP_CONCAT(oi.sku_id) as group_sku_id," +
             " GROUP_CONCAT(oi.num) as group_num" +
@@ -192,4 +195,30 @@
     List<Order> queryListByParams(@Param(Constants.WRAPPER) Wrapper<Order> queryWrapper);
 
 
+    @Select("SELECT " +
+            "  DATE(create_time) AS day, " +
+            "  COUNT(*) AS count " +
+            "  FROM" +
+            "  li_order o" +
+            "  WHERE " +
+            "  o.create_time BETWEEN #{startTime} AND #{endTime} " +
+            "  GROUP BY" +
+            "  day " +
+            "  ORDER BY " +
+            "  day ASC")
+    List<Map<String, Object>>  selectOrderCountByDay(Date startTime, Date endTime);
+
+    @Select("SELECT " +
+            "  DATE(create_time) AS day, " +
+            "  HOUR(create_time) AS hour," +
+            "  COUNT(*) AS count " +
+            "  FROM" +
+            "  li_order o" +
+            "  WHERE " +
+            "  o.create_time BETWEEN #{startTime} AND #{endTime} " +
+            "  GROUP BY" +
+            "  day " +
+            "  ORDER BY " +
+            "  day , hour ASC")
+    List<Map<String, Object>>  selectOrderTimePeriod(Date startTime, Date endTime);
 }
\ No newline at end of file

--
Gitblit v1.8.0