From 3fb300fe477e128976b1583ebc1a57aae372c645 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Dec 2024 17:37:44 +0800
Subject: [PATCH] refactor(mallMember): 注释掉会员列表中的到期时间字段 - 在 mallMemberList.html 文件中,添加了对 '到期时间' 字段的注释 -此修改可能是为了暂时移除或隐藏该字段的显示

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index e1f180e..9e7f9e6 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -127,6 +127,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" />
@@ -215,7 +216,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 +375,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 +388,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