From 3280d1bd977e8fb5c9c60e615612fabb7b99c3e3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 27 Jul 2022 09:46:58 +0800
Subject: [PATCH] 20220727 保存代码
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 660351c..5b4901c 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -15,9 +15,18 @@
b.sku_image,
b.cnt,
b.price,
- b.amount
+ b.amount,
+ c.name leader_name,
+ c.phone leader_phone,
+ c.address_pic,
+ c.address_area,
+ c.province,
+ c.city,
+ c.township,
+ c.detail_address
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
+ inner join mall_team_leader c on a.take_unique_code=c.unique_code
<where>
a.del_flag=2
<if test="record.status == 4 and record.status != 0">
@@ -35,6 +44,12 @@
<if test="record.orderType != null">
and a.order_type=#{record.orderType}
</if>
+ <if test="record.deliveryType != null">
+ and a.delivery_type=#{record.deliveryType}
+ </if>
+ <if test="record.takeUniqueCode != null">
+ and a.take_unique_code=#{record.takeUniqueCode}
+ </if>
</where>
order by a.created_time desc
</select>
@@ -50,6 +65,7 @@
b.phone memberPhone
from mall_order_info a
left join mall_member b on a.member_id = b.id
+ left join mall_team_leader c on a.take_unique_code = c.unique_code
<where>
a.del_flag=2
<if test="record != null">
@@ -62,11 +78,17 @@
<if test="record.status != null and record.status != ''">
and a.status = #{record.status}
</if>
+ <if test="record.deliveryType != null and record.deliveryType != ''">
+ and a.delivery_type = #{record.deliveryType}
+ </if>
<if test="record.orderNo != null and record.orderNo != ''">
and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%'))
</if>
<if test="record.name != null and record.name != ''">
and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+ </if>
+ <if test="record.uniqueCode != null and record.uniqueCode != ''">
+ and a.take_unique_code = #{record.uniqueCode}
</if>
</if>
</where>
@@ -99,7 +121,17 @@
<result column="comment_state" property="commentState" />
<result column="carriage" property="carriage" />
<result column="remark" property="remark" />
+ <result column="take_code" property="takeCode" />
+ <result column="take_unique_code" property="takeUniqueCode" />
<result column="del_flag" property="delFlag" />
+ <result column="leader_name" property="leaderName" />
+ <result column="leader_phone" property="leaderPhone" />
+ <result column="address_pic" property="addressPic" />
+ <result column="address_area" property="addressArea" />
+ <result column="province" property="province" />
+ <result column="city" property="city" />
+ <result column="township" property="township" />
+ <result column="detail_address" property="detailAddress" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
<id property="id" column="item_id" />
<result property="orderId" column="order_id" />
@@ -129,9 +161,18 @@
b.sku_image,
b.cnt,
b.price,
- b.amount
+ b.amount,
+ c.name leader_name,
+ c.phone leader_phone,
+ c.address_pic,
+ c.address_area,
+ c.province,
+ c.city,
+ c.township,
+ c.detail_address
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
+ inner join mall_team_leader c on a.take_unique_code=c.unique_code
<where>
a.del_flag=2
<if test="record.query != null and record.query != ''">
@@ -170,9 +211,18 @@
b.cnt,
b.price,
b.amount,
- b.is_normal
+ b.is_normal,
+ c.name leader_name,
+ c.phone leader_phone,
+ c.address_pic,
+ c.address_area,
+ c.province,
+ c.city,
+ c.township,
+ c.detail_address
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
+ inner join mall_team_leader c on a.take_unique_code=c.unique_code
where a.id=#{id}
</select>
--
Gitblit v1.9.1