From 29a8eeb43120d2019032f303bc9262308abb611b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Sep 2022 14:39:41 +0800
Subject: [PATCH] 20220902
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index ea085b4..b495634 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -54,8 +54,10 @@
order by a.created_time desc
</select>
- <select id="selectOrderByMemberIdAndId" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
- select * from mall_order_info a
+ <select id="selectOrderByMemberIdAndId" resultMap="OrderInfoMap">
+ select
+ a.*,
+ b.goods_name from mall_order_info a
inner join mall_order_item b on a.id=b.order_id where a.member_id=#{memberId} and a.id=#{id}
</select>
@@ -132,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" />
@@ -148,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>
@@ -162,6 +168,7 @@
b.style_name,
b.sku_name,
b.sku_image,
+ b.state,
b.cnt,
b.price,
b.amount,
@@ -188,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}
@@ -211,6 +218,7 @@
b.style_name,
b.sku_name,
b.sku_image,
+ b.state,
b.cnt,
b.price,
b.amount,
@@ -222,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
@@ -231,11 +241,12 @@
<select id="selectMemberOrderStatusCnt" resultType="java.util.Map">
select
- status,
+ a.status,
count(1) cnt
- from mall_order_info
- where del_flag=2 and member_id=#{memberId}
- group by status
+ from mall_order_info a
+ 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
</select>
<select id="getMallOrderDetailById" resultType="cc.mrbird.febs.mall.vo.AdminOrderDetailVo">
@@ -322,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>
@@ -352,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