From 6e39306a7fc83890659f098ed9c6c5f686a6371b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 20 May 2025 11:54:08 +0800
Subject: [PATCH] feat(mall): 优化新人礼领取逻辑并添加领取状态字段- 优化新人礼领取逻辑，检查优惠券是否存在且状态为有效 - 在 MallMemberVo 中添加 newGift 字段，用于表示是否领取新人礼
---
src/main/resources/mapper/modules/MallInvoiceMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallInvoiceMapper.xml b/src/main/resources/mapper/modules/MallInvoiceMapper.xml
index 537d3a5..e717aa3 100644
--- a/src/main/resources/mapper/modules/MallInvoiceMapper.xml
+++ b/src/main/resources/mapper/modules/MallInvoiceMapper.xml
@@ -38,14 +38,30 @@
<if test="record.state != null">
and a.state = #{record.state}
</if>
- <if test="record.orderNo != null">
+ <if test="record.orderNo != null and record.orderNo != ''">
and a.order_no = #{record.orderNo}
</if>
- <if test="record.payOrderNo != null">
+ <if test="record.payOrderNo != null and record.payOrderNo != ''">
and a.fapiao_apply_id = #{record.payOrderNo}
</if>
</where>
order by a.created_time desc
</select>
+ <select id="getAdminInvoiceDetailVoById" resultType="cc.mrbird.febs.mall.vo.AdminInvoiceDetailVo">
+ select
+ a.*
+ from mall_invoice a
+ where id = #{id}
+ </select>
+
+ <select id="getInvoiceItemList" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
+ select
+ a.*,
+ b.unit
+ from mall_order_item a
+ left join mall_goods b on a.goods_id = b.id
+ where order_id = #{record.orderId}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1