From e71bc3aed32076c75f61980fcd0957e0d8ae29c1 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 15:51:19 +0800
Subject: [PATCH] feat(mall): 新增订单项信息并优化订单查询

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index ae7ff75..eca9b88 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -391,6 +391,23 @@
         <result column="township" property="township" />
         <result column="detail_address" property="detailAddress" />
         <result column="express_no" property="expressNo" />
+        <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
+            <id property="id" column="item_id" />
+            <result property="orderId" column="order_id" />
+            <result property="goodsId" column="goods_id" />
+            <result property="skuId" column="sku_id" />
+            <result property="goodsName" column="goods_name" />
+            <result property="styleName" column="style_name" />
+            <result property="skuName" column="sku_name" />
+            <result property="skuImage" column="sku_image" />
+            <result property="cnt" column="cnt" />
+            <result property="price" column="price" />
+            <result property="amount" column="amount" />
+            <result property="isNormal" column="is_normal" />
+            <result property="memberInviteId" column="member_invite_id" />
+            <result property="memberCouponId" column="member_coupon_id" />
+            <result property="state" column="state" />
+        </collection>
     </resultMap>
 
     <select id="selectNewApiOrderListInPage" resultMap="NewOrderInfoMap">
@@ -399,11 +416,15 @@
         ,express.express_no
         from mall_order_info a
             left join mall_express_info express on a.id=express.order_id
+            left join mall_order_item b on a.id=b.order_id
         <where>
             a.del_flag=2
             <if test="record.memberId != null">
                 and a.member_id=#{record.memberId}
             </if>
+            <if test="record.query != null and record.query != ''">
+                and (b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.style_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.sku_name like CONCAT('%', CONCAT(#{record.query}, '%')))
+            </if>
             <if test="record.status == 4 and record.status != 0">
                 and a.status = 4
             </if>

--
Gitblit v1.9.1