From d5bf7fd84dc51ebb3cadc283177c339895552246 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 14:26:48 +0800
Subject: [PATCH] 20220902

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |   32 ++++++++++++--------------------
 1 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 226f2f1..4271bd2 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -167,32 +167,20 @@
         </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,
+               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
+        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">
@@ -271,6 +259,10 @@
         select * from mall_order_info where status=#{status}
     </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>
+
     <select id="selectCntDirectOrTeam" resultType="java.lang.Integer">
         select IFNULL(count(1), 0) from mall_order_info a
           inner join mall_member b on a.member_id=b.ID

--
Gitblit v1.9.1