From 529ad9dd8d1876b57e852bc45b602ba3ccc8df2a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 10 Apr 2024 17:19:08 +0800
Subject: [PATCH] 公告-首页公告调整
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 7fb0231..9e7f9e6 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -59,7 +59,7 @@
b.phone memberPhone,
(select member.name from mall_member member where member.invite_id = b.referrer_id) refererName
from mall_order_info a
- left join mall_member b on a.member_id = b.id
+ inner join mall_member b on a.member_id = b.id
<where>
<if test="record != null">
<if test="record.payResult != null and record.payResult != ''">
@@ -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" />
@@ -152,6 +153,8 @@
<result property="price" column="price" />
<result property="amount" column="amount" />
<result property="isNormal" column="is_normal" />
+ <result property="memberInviteId" column="member_invite_id" />
+ <result property="memberCouponId" column="member_coupon_id" />
<result property="state" column="state" />
</collection>
</resultMap>
@@ -200,6 +203,8 @@
b.cnt,
b.price,
b.amount,
+ b.member_invite_id,
+ b.member_coupon_id,
b.is_normal
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
@@ -211,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>
@@ -227,6 +232,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">
@@ -366,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" />
@@ -378,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">
@@ -450,8 +463,12 @@
and b.invite_id=#{inviteId}
</if>
<if test="type == 2">
- and find_in_set(#{inviteId}, b.referrer_ids)
+ 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