From 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 08 九月 2025 13:41:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 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 45e5d9e..6e851de 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
@@ -60,8 +60,11 @@
"oi.after_sale_status AS after_sale_status," +
"o.logistics_time AS logistics_time," +
"o.complete_time AS complete_time," +
- "o.store_name AS store_name " +
- " FROM li_order o LEFT JOIN li_order_item oi ON oi.order_sn = o.sn ${ew.customSqlSegment}")
+ "o.store_name AS store_name, " +
+ "m.nick_name AS nickName" +
+ " 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}")
List<OrderExportDTO> queryExportOrder(@Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
/**
@@ -82,8 +85,12 @@
* @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 " +
- ",GROUP_CONCAT(oi.goods_id) as group_goods_id," +
+ "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.consignee_name AS consigneeName," +
+ "o.consignee_mobile AS consigneeMobile," +
+ "o.member_id AS memberId," +
+ "m.nick_name AS nickName," +
+ " 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" +
",GROUP_CONCAT(oi.image) as group_images" +
@@ -95,8 +102,36 @@
",GROUP_CONCAT(oi.goods_price) as group_goods_price " +
",GROUP_CONCAT(oi.is_refund) as group_is_refund " +
",GROUP_CONCAT(oi.refund_price) as group_refund_price " +
- " FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn ${ew.customSqlSegment} ")
+ " FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn " +
+ "LEFT JOIN li_member m on m.id = o.member_id " +
+ "${ew.customSqlSegment}")
IPage<OrderSimpleVO> queryByParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
+
+ /**
+ * 鑾峰緱鎸囧畾鐢ㄦ埛鐨勮鍗�
+ * @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, " +
+ "o.consignee_name AS consigneeName," +
+ "o.consignee_mobile AS consigneeMobile," +
+ "o.member_id AS memberId," +
+ " 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" +
+ ",GROUP_CONCAT(oi.image) as group_images" +
+ ",GROUP_CONCAT(oi.goods_name) as group_name " +
+ ",GROUP_CONCAT(oi.after_sale_status) as group_after_sale_status" +
+ ",GROUP_CONCAT(oi.complain_status) as group_complain_status" +
+ ",GROUP_CONCAT(oi.comment_status) as group_comment_status" +
+ ",GROUP_CONCAT(oi.sn) as group_order_items_sn " +
+ ",GROUP_CONCAT(oi.goods_price) as group_goods_price " +
+ ",GROUP_CONCAT(oi.is_refund) as group_is_refund " +
+ ",GROUP_CONCAT(oi.refund_price) as group_refund_price " +
+ " FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn " +
+ "${ew.customSqlSegment}")
+ List<OrderSimpleVO> queryByParamsCount(@Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
/**
* 鏌ヨ璁㈠崟绠�鐭俊鎭垎椤�
*
--
Gitblit v1.8.0