From a56aa58c55f966c38cb8b5fc969eb1018fad5ce8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 16:38:13 +0800
Subject: [PATCH] 20220902

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 4518cc7..d8b6807 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -54,16 +54,19 @@
         order by a.created_time desc
     </select>
 
-    <select id="selectOrderByMemberIdAndId" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
-        select * from mall_order_info
-                          inner join mall_order_item b on a.id=b.order_id where member_id=#{memberId} and id=#{id}
+    <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>
 
     <select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
         select a.*,
                b.name memberName,
                b.bind_phone memberBindPhone,
-               b.phone memberPhone
+               b.phone memberPhone,
+               c.name leaderName
         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
@@ -82,6 +85,9 @@
                 <if test="record.deliveryType != null and record.deliveryType != ''">
                     and a.delivery_type = #{record.deliveryType}
                 </if>
+                <if test="record.isHome != null and record.isHome != ''">
+                    and a.is_home = #{record.isHome}
+                </if>
                 <if test="record.orderNo != null and record.orderNo != ''">
                     and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%'))
                 </if>
@@ -90,6 +96,12 @@
                 </if>
                 <if test="record.uniqueCode != null and record.uniqueCode != ''">
                     and a.take_unique_code = #{record.uniqueCode}
+                </if>
+                <if test="record.startTime != null and record.startTime != ''">
+                    and a.order_time &gt;= #{record.startTime}
+                </if>
+                <if test="record.endTime != null and record.endTime != ''">
+                    and a.order_time &lt;= #{record.endTime}
                 </if>
             </if>
         </where>
@@ -132,6 +144,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 +163,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 +178,7 @@
                b.style_name,
                b.sku_name,
                b.sku_image,
+               b.state,
                b.cnt,
                b.price,
                b.amount,
@@ -188,7 +205,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 +228,7 @@
             b.style_name,
             b.sku_name,
             b.sku_image,
+            b.state,
             b.cnt,
             b.price,
             b.amount,
@@ -222,6 +240,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 +251,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 +343,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 +373,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