From 696a4c0f5cf267bcf2cd721484afd2694bf8ca4e Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 25 Jan 2024 21:24:17 +0800
Subject: [PATCH] fix

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index d082bf8..7a5741d 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -233,6 +233,10 @@
         select * from mall_order_info where status=#{status}
     </select>
 
+    <select id="selectOrderInfoByStatusAndIsInvoice" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+        select * from mall_order_info where status = #{status} and is_invoice = #{isInvoice}
+    </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 1440 minute)
     </select>
@@ -382,12 +386,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">
@@ -458,4 +465,8 @@
             </if>
         </where>
     </select>
+
+    <select id="selectBypayOrderNo" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+        select * from mall_order_info where pay_order_no = #{payOrderNo}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1