From c0cae0a68ec2d917a9fad1f093a16b6d1d16af3c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Mar 2023 13:41:37 +0800
Subject: [PATCH] 后台修改

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |   63 ++++---------------------------
 1 files changed, 9 insertions(+), 54 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 3c4df5f..dc4c2d7 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">
@@ -65,11 +56,9 @@
         select a.*,
                b.name memberName,
                b.bind_phone memberBindPhone,
-               b.phone memberPhone,
-               c.name leaderName
+               b.phone memberPhone
         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
         <where>
             <if test="record != null">
                 <if test="record.payResult != null and record.payResult != ''">
@@ -168,18 +157,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">
@@ -219,20 +199,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>
 
@@ -241,7 +210,6 @@
             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>
@@ -261,7 +229,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">
@@ -413,17 +381,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">
@@ -453,17 +412,13 @@
         select
         a.*,
         b.goods_name,
+        b.sku_name,
         b.cnt,
         b.price,
-        b.amount,
-        c.name leader_name,
-        c.phone leader_phone,
-        c.address_area,
-        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 and  a.id = #{orderId} and a.take_unique_code = #{takeUniqueCode}
+        where a.del_flag=2 and  a.id = #{orderId}
         order by a.created_time desc
     </select>
 

--
Gitblit v1.9.1