From c7ad20b2170aa3e30e271c2f3031c28a8deb3bf6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 17 Aug 2022 15:34:05 +0800
Subject: [PATCH] 20220810

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 247081a..1dc9cd3 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -54,12 +54,15 @@
         order by a.created_time desc
     </select>
 
-    <select id="selectOrderByMemberIdAndId" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
-        select * from mall_order_info 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 *,
+        select a.*,
                b.name memberName,
                b.bind_phone memberBindPhone,
                b.phone memberPhone
@@ -123,6 +126,8 @@
         <result column="remark" property="remark" />
         <result column="take_code" property="takeCode" />
         <result column="take_unique_code" property="takeUniqueCode" />
+        <result column="delivery_state" property="deliveryState" />
+        <result column="is_home" property="isHome" />
         <result column="del_flag" property="delFlag" />
         <result column="leader_name" property="leaderName" />
         <result column="leader_phone" property="leaderPhone" />
@@ -333,4 +338,20 @@
         select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
         where pay_method = #{payMethod} and status = #{statue}
     </select>
+
+    <update id="updateOrderStateAndDeliveryState">
+        update mall_order_info
+        set status = #{orderState},
+            delivery_state = #{deliveryState}
+        where id = #{orderId}
+    </update>
+
+    <select id="selectMemberOrderStatusCntByUniquecode" resultType="java.util.Map">
+        select
+            status,
+            count(1) cnt
+        from mall_order_info
+        where del_flag = 2 and take_unique_code = #{uniqueCode}
+        group by status
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1