From 3615c5f5832e01f2d6f41bf72e792aae66db0e22 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Jan 2024 11:41:21 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 0086c6f..e79c710 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>
@@ -231,6 +231,10 @@
<select id="selectOrderInfoByStatus" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
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">
@@ -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">
@@ -454,9 +461,12 @@
and b.invite_id=#{inviteId}
</if>
<if test="type == 2">
--- and find_in_set(#{inviteId}, b.referrer_ids)
- and b.referrer_id = #{inviteId}
+ and FIND_IN_SET(#{inviteId},b.referrer_ids)
</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