From 059a96cc2d59d68b6eaec7403c2e9da1bf7b6ab2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 15:03:08 +0800
Subject: [PATCH] 20220902
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 88ffe4e..d8b6807 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -65,7 +65,8 @@
select a.*,
b.name memberName,
b.bind_phone memberBindPhone,
- b.phone memberPhone
+ b.phone memberPhone,
+ c.name leaderName
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
@@ -84,6 +85,9 @@
<if test="record.deliveryType != null and record.deliveryType != ''">
and a.delivery_type = #{record.deliveryType}
</if>
+ <if test="record.isHome != null and record.isHome != ''">
+ and a.is_home = #{record.isHome}
+ </if>
<if test="record.orderNo != null and record.orderNo != ''">
and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%'))
</if>
@@ -92,6 +96,12 @@
</if>
<if test="record.uniqueCode != null and record.uniqueCode != ''">
and a.take_unique_code = #{record.uniqueCode}
+ </if>
+ <if test="record.startTime != null and record.startTime != ''">
+ and a.order_time >= #{record.startTime}
+ </if>
+ <if test="record.endTime != null and record.endTime != ''">
+ and a.order_time <= #{record.endTime}
</if>
</if>
</where>
@@ -134,8 +144,8 @@
<result column="address_pic" property="addressPic" />
<result column="address_area" property="addressArea" />
<result column="province" property="province" />
- <result column="longitude" property="leaderLongitude" />
- <result column="latitude" property="leaderLatitude" />
+ <result column="leaderLongitude" property="leaderLongitude" />
+ <result column="leaderLatitude" property="leaderLatitude" />
<result column="province" property="province" />
<result column="city" property="city" />
<result column="township" property="township" />
@@ -333,7 +343,7 @@
<update id="updateOrderConfirmStatus">
update mall_order_info
set status=4,
- receiving_time=new Date()
+ receiving_time=#{updateTime}
where status=3 and date_format(pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</update>
--
Gitblit v1.9.1