From 2812309093cc6fd31a75d10f62bc52abb7588f56 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 17:16:57 +0800
Subject: [PATCH] feat(mall): 后台活动列表添加分页和搜索功能 - 在 ActivityServiceImpl 中实现 getAdminListInPage 方法,支持分页和搜索 - 在 AdminActivityController 中添加 list 接口,返回分页数据 - 在 IActivityService 中定义 getAdminListInPage 接口 - 更新前端模板,根据活动状态控制按钮显示

---
 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