From ad22a1e5595b76436d005ba9f1f928ea094fe5c0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 22 Sep 2022 17:52:42 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 59 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 642a937..22dd8d9 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" />
@@ -157,29 +167,29 @@
</collection>
</resultMap>
- <select id="selectApiOrderListInPage" resultMap="OrderInfoMap">
+ <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 leader_name,
- c.phone leader_phone,
- c.address_pic,
- c.address_area,
+-- 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,
+ c.address_area addressArea,
c.province,
c.city,
c.township,
- c.detail_address
+ 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
@@ -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>
@@ -363,4 +373,9 @@
where del_flag = 2 and take_unique_code = #{uniqueCode}
group by status
</select>
+
+ <select id="selectOrderByStatusAndPayTime" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ select * from mall_order_info where status=#{status}
+ and date_format(pay_time, '%Y-%m-%d') = date_format(#{paytime}, '%Y-%m-%d')
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1