From 05522e00fc976bec6644bd00953e1a4e1c3d96e8 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 23 十月 2025 14:26:43 +0800
Subject: [PATCH] 调整
---
framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 77 insertions(+), 6 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 6e851de..4f2f6c4 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,11 +63,48 @@
"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}")
List<OrderExportDTO> queryExportOrder(@Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
+ /**
+ * 鏌ヨ瀵煎嚭璁㈠崟DTO鍒楄〃
+ *
+ * @param queryWrapper 鏌ヨ鏉′欢
+ * @return 瀵煎嚭璁㈠崟DTO鍒楄〃
+ */
+ @Select("SELECT o.sn AS order_sn," +
+ "oi.sn AS order_item_sn," +
+ "oi.goods_name AS goods_name," +
+ "oi.num AS num," +
+ "oi.goods_id AS goods_id," +
+ "oi.unit_price AS unit_price," +
+ "oi.flow_price AS flow_price," +
+ "oi.price_detail AS price_detail," +
+ "o.payment_method AS payment_method," +
+ "o.consignee_name AS consignee_name," +
+ "o.consignee_mobile AS consignee_mobile," +
+ "o.consignee_address_path AS consignee_address_path," +
+ "o.consignee_detail AS consignee_detail," +
+ "o.remark AS remark," +
+ "o.create_time AS create_time," +
+ "o.payment_time AS payment_time," +
+ "o.client_type AS client_type," +
+ "o.order_status AS order_status," +
+ "o.order_type AS order_type," +
+ "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, " +
+ "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 " +
+ "JOIN li_store ls ON ls.id = m.share_store_id " +
+ "${ew.customSqlSegment}")
+ List<OrderExportDTO> queryShareExportOrder(@Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
/**
* 鏌ヨ璁㈠崟鏀粯璁板綍
@@ -90,6 +129,8 @@
"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," +
" GROUP_CONCAT(oi.num) as group_num" +
@@ -105,7 +146,38 @@
" 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);
+ IPage<OrderSimpleVO> queryByParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper); /**
+ * 鏌ヨ璁㈠崟绠�鐭俊鎭垎椤�
+ *
+ * @param page 鍒嗛〉
+ * @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," +
+ "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," +
+ " 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 " +
+ "LEFT JOIN li_member m on m.id = o.member_id " +
+ "JOIN li_store ls ON ls.id = m.share_store_id " +
+ "${ew.customSqlSegment}")
+ IPage<OrderSimpleVO> queryByShareParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
/**
* 鑾峰緱鎸囧畾鐢ㄦ埛鐨勮鍗�
@@ -117,6 +189,7 @@
"o.consignee_name AS consigneeName," +
"o.consignee_mobile AS consigneeMobile," +
"o.member_id AS memberId," +
+ "o.modify_address_flag AS modifyAddressFlag,"+
" 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" +
@@ -139,8 +212,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,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" +
@@ -188,6 +261,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);
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0