From d5bf7fd84dc51ebb3cadc283177c339895552246 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 14:26:48 +0800
Subject: [PATCH] 20220902
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 22dd8d9..4271bd2 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -170,18 +170,6 @@
<select id="selectApiOrderListInPage" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
select
a.*,
--- b.id item_id,
--- b.order_id,
--- b.goods_id,
--- b.sku_id,
--- b.goods_name,
--- b.style_name,
--- b.sku_name,
--- b.sku_image,
--- b.state,
--- b.cnt,
--- b.price,
--- b.amount,
c.name leaderName,
c.phone leaderPhone,
c.address_pic addressPic,
@@ -191,12 +179,12 @@
c.township,
c.detail_address detailAddress
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
+ 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 != ''">
- 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 test="record.memberId != null">
+ and a.member_id=#{record.memberId}
</if>
<if test="record.status == 4 and record.status != 0">
and a.status = 4
@@ -207,8 +195,8 @@
<if test="record.status == 5">
and a.status = 7 or b.state in (2,3)
</if>
- <if test="record.memberId != null">
- and a.member_id=#{record.memberId}
+ <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.orderType != null">
and a.order_type=#{record.orderType}
@@ -271,6 +259,10 @@
select * from mall_order_info where status=#{status}
</select>
+ <select id="selectOrderInfoUpTime" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ select * from mall_order_info where status=#{status} and now() > date_add(order_time,interval 15 minute)
+ </select>
+
<select id="selectCntDirectOrTeam" resultType="java.lang.Integer">
select IFNULL(count(1), 0) from mall_order_info a
inner join mall_member b on a.member_id=b.ID
--
Gitblit v1.9.1