From eef8f98f76fdeb17c3d4a968c93b8b8351111905 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Sep 2022 15:26:30 +0800
Subject: [PATCH] 20220902
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 1baaafd..b495634 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -134,6 +134,9 @@
<result column="address_pic" property="addressPic" />
<result column="address_area" property="addressArea" />
<result column="province" property="province" />
+ <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" />
<result column="detail_address" property="detailAddress" />
@@ -150,6 +153,7 @@
<result property="price" column="price" />
<result property="amount" column="amount" />
<result property="isNormal" column="is_normal" />
+ <result property="state" column="state" />
</collection>
</resultMap>
@@ -164,6 +168,7 @@
b.style_name,
b.sku_name,
b.sku_image,
+ b.state,
b.cnt,
b.price,
b.amount,
@@ -190,7 +195,7 @@
and a.status = #{record.status}
</if>
<if test="record.status == 5">
- and a.status = 7
+ and a.status = 7 or b.state in (2,3)
</if>
<if test="record.memberId != null">
and a.member_id=#{record.memberId}
@@ -213,6 +218,7 @@
b.style_name,
b.sku_name,
b.sku_image,
+ b.state,
b.cnt,
b.price,
b.amount,
@@ -224,6 +230,8 @@
c.province,
c.city,
c.township,
+ c.longitude leaderLongitude,
+ c.latitude leaderLatitude,
c.detail_address
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
@@ -236,7 +244,6 @@
a.status,
count(1) cnt
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 and a.member_id=#{memberId}
group by a.status
@@ -326,7 +333,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>
@@ -356,4 +363,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