From 47e03d0aa72b6bd1c62c4ecff0c25289890f7abc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 12 Feb 2025 10:49:17 +0800
Subject: [PATCH] refactor(mall): 根据系统配置选择不同的物流服务接口 - 在 AdminMallOrderService 和 CommonService 中添加了根据系统配置选择物流服务接口的逻辑 - 新增了 SENDER_STATE 数据字典项,用于控制使用测试环境还是生产环境的物流服务 - 根据系统配置,选择不同的 ClientParamEnum 实例来调用

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