From 18a9f86a8c1fdb6c42c4212dcaa1de437f6f4861 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 15 十月 2025 14:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java | 34 ++++------------------------------
1 files changed, 4 insertions(+), 30 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 185947a..79f23c3 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
@@ -63,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}")
@@ -92,6 +93,7 @@
"o.consignee_mobile AS consigneeMobile," +
"o.member_id AS memberId," +
"m.nick_name AS nickName," +
+ "o.customize_flag AS customizeFlag," +
"o.modify_address_flag AS modifyAddressFlag,"+
" GROUP_CONCAT(oi.goods_id) as group_goods_id," +
" GROUP_CONCAT(oi.sku_id) as group_sku_id," +
@@ -144,7 +146,7 @@
* @return 绠�鐭鍗曞垎椤�
*/
@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 " +
+ "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,o.customize_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,32 +194,4 @@
@Select("select o.* " +
" FROM li_order o INNER JOIN li_order_item AS oi on o.sn = oi.order_sn ${ew.customSqlSegment} ")
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