From a2a4dd75b0c0e51b325c4fbe89da80dfa4a5d24f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Feb 2023 17:13:57 +0800
Subject: [PATCH] 滑动条
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 88 +++++++++++++++++++++-----------------------
1 files changed, 42 insertions(+), 46 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 092ce2b..a9d5efd 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -15,18 +15,9 @@
b.sku_image,
b.cnt,
b.price,
- b.amount,
- c.name leader_name,
- c.phone leader_phone,
- c.address_pic,
- c.address_area,
- c.province,
- c.city,
- c.township,
- c.detail_address
+ b.amount
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
<if test="record.status == 4 and record.status != 0">
@@ -71,7 +62,6 @@
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
<where>
- a.del_flag=2
<if test="record != null">
<if test="record.payResult != null and record.payResult != ''">
and a.pay_result = #{record.payResult}
@@ -169,18 +159,9 @@
<select id="selectApiOrderListInPage" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
select
- a.*,
- c.name leaderName,
- c.phone leaderPhone,
- c.address_pic addressPic,
- c.address_area addressArea,
- c.province,
- c.city,
- c.township,
- c.detail_address detailAddress
+ a.*
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
<if test="record.memberId != null">
@@ -220,20 +201,9 @@
b.cnt,
b.price,
b.amount,
- b.is_normal,
- c.name leader_name,
- c.phone leader_phone,
- c.address_pic,
- c.address_area,
- c.province,
- c.city,
- c.township,
- c.longitude leaderLongitude,
- c.latitude leaderLatitude,
- c.detail_address
+ b.is_normal
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.id=#{id}
</select>
@@ -242,13 +212,14 @@
a.status,
count(1) cnt
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">
- select * from mall_order_info a where a.id = #{id}
+ select a.*,b.area addressArea,b.address addressInfo from mall_order_info a
+ left join mall_address_info b on a.address_id = b.id
+ where a.id = #{id}
</select>
<select id="getMallOrderItemByOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
@@ -260,7 +231,7 @@
</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 * from mall_order_info where status=#{status} and now() > date_add(order_time,interval 1440 minute)
</select>
<select id="selectCntDirectOrTeam" resultType="java.lang.Integer">
@@ -412,17 +383,8 @@
<select id="selectNewApiOrderListInPage" resultMap="NewOrderInfoMap">
select
- a.*,
- c.name leader_name,
- c.phone leader_phone,
- c.address_pic,
- c.address_area,
- c.province,
- c.city,
- c.township,
- c.detail_address
+ a.*
from mall_order_info a
- inner join mall_team_leader c on a.take_unique_code=c.unique_code
<where>
a.del_flag=2
<if test="record.memberId != null">
@@ -443,4 +405,38 @@
</where>
order by a.created_time desc
</select>
+
+ <select id="selectByIdAndTakeUniqueCode" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ select * from mall_order_info where id = #{orderId} and take_unique_code = #{takeUniqueCode}
+ </select>
+
+ <select id="selectAllOrderInfoByIdAndTakeUniqueCode" resultMap="OrderInfoMap">
+ select
+ a.*,
+ b.goods_name,
+ b.cnt,
+ b.price,
+ b.amount
+ from mall_order_info a
+ inner join mall_order_item b on a.id=b.order_id
+ where a.del_flag=2 and a.id = #{orderId}
+ order by a.created_time desc
+ </select>
+
+ <select id="getGoodsStatisticsInPage" resultType="cc.mrbird.febs.mall.vo.AdminGoodsStatisticsVo">
+ select
+ goods_name goodsName,
+ SUM(cnt) goodsCnt
+ from mall_order_item
+ <where>
+ <if test="record.orderIdsStr != null">
+ and order_id in
+ <foreach collection="record.orderIdsStr" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ GROUP BY goods_id
+ ORDER BY goods_id desc
+</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1