From a421b06527fce5ebf1a5bb00e51a9bfc4df2626e Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 26 Jan 2024 22:57:20 +0800
Subject: [PATCH] fix

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index e1f180e..80c06bf 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -215,7 +215,7 @@
             a.status,
             count(1) cnt
         from mall_order_info a
-        where a.del_flag=2 and a.member_id=#{memberId}
+        where a.del_flag=2 and a.member_id=#{memberId} and order_type = 1
         group by a.status
     </select>
 
@@ -374,6 +374,7 @@
         <result column="take_unique_code" property="takeUniqueCode" />
         <result column="delivery_state" property="deliveryState" />
         <result column="is_home" property="isHome" />
+        <result column="is_free" property="isFree" />
         <result column="del_flag" property="delFlag" />
         <result column="leader_name" property="leaderName" />
         <result column="leader_phone" property="leaderPhone" />
@@ -386,12 +387,15 @@
         <result column="city" property="city" />
         <result column="township" property="township" />
         <result column="detail_address" property="detailAddress" />
+        <result column="express_no" property="expressNo" />
     </resultMap>
 
     <select id="selectNewApiOrderListInPage" resultMap="NewOrderInfoMap">
         select
         a.*
+        ,express.express_no
         from mall_order_info a
+            left join mall_express_info express on a.id=express.order_id
         <where>
             a.del_flag=2
             <if test="record.memberId != null">

--
Gitblit v1.9.1