From 1b394b961e92e4b2f81023e55b6af6e30b830e86 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 10:55:10 +0800
Subject: [PATCH] 20221221

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 95e7910..5e7a466 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -44,14 +44,19 @@
     </select>
 
     <select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
-        select *,
+        select a.*,
                b.name memberName,
                b.bind_phone memberBindPhone,
-               b.phone memberPhone
-        from mall_order_info a
+               b.phone memberPhone,
+               c.goods_name
+        from mall_order_item c
+        left join mall_order_info a on a.id = c.order_id
         left join mall_member b on a.member_id = b.id
         <where>
             <if test="record != null">
+                <if test="record.goodsName != null and record.goodsName != ''">
+                    and c.goods_name like CONCAT('%', CONCAT(#{record.goodsName}, '%'))
+                </if>
                 <if test="record.payResult != null and record.payResult != ''">
                     and a.pay_result = #{record.payResult}
                 </if>
@@ -105,6 +110,8 @@
         <result column="carriage" property="carriage" />
         <result column="remark" property="remark" />
         <result column="del_flag" property="delFlag" />
+        <result column="deliver_type" property="deliverType" />
+        <result column="shop_id" property="shopId" />
         <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
             <id property="id" column="item_id" />
             <result property="orderId" column="order_id" />
@@ -302,4 +309,13 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="selectCountByCreateTimeAndMemberId" resultType="java.lang.Integer">
+        select
+            count(a.id)
+        from mall_order_info a
+        where
+            date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createTime}
+            and a.member_id = #{memberId}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1