From ce983cb64cd6d7c90b05583425717908c6743b51 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 15 Jul 2023 11:11:22 +0800
Subject: [PATCH] 正式环境
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 95e7910..9fbc5f9 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>
@@ -66,6 +71,9 @@
</if>
<if test="record.name != null and record.name != ''">
and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+ </if>
+ <if test="record.phone != null and record.phone != ''">
+ and b.phone like CONCAT('%', CONCAT(#{record.phone}, '%'))
</if>
<if test="record.startTime != null and record.startTime != ''">
and a.order_time >= #{record.startTime}
@@ -105,6 +113,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" />
--
Gitblit v1.9.1