From 6a2d5ddbb3ca06b48b94f6850ef0d7da8450ad99 Mon Sep 17 00:00:00 2001
From: lizhenhua <1075222162@qq.com>
Date: Tue, 10 Feb 2026 17:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94=E9=93=BE?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DrpInventoryIntoDetailServiceImpl.java    |    4 +-
 .../DrpInventoryIntoDetailMapper.xml          |  455 ++-----
 .../mapper/reportforms/DrpInventorMapper.xml  |  424 ++++++
 .../DrpInventoryIntoDetailMapper.xml          |  544 ++++++++
 .../mapper/reportforms/OrgConsumerMapper.xml  | 1176 +++++++++++++++++
 .../mapper/reportforms/placeMapper.xml        |  136 ++
 6 files changed, 2390 insertions(+), 349 deletions(-)
 create mode 100644 bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/DrpInventorMapper.xml
 create mode 100644 bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml
 create mode 100644 bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml
 create mode 100644 bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/placeMapper.xml

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryIntoDetailServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryIntoDetailServiceImpl.java
index 739d9576..9ed54155 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryIntoDetailServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryIntoDetailServiceImpl.java
@@ -87,12 +87,12 @@ public class DrpInventoryIntoDetailServiceImpl implements IDrpInventoryIntoDetai
     public Map<String, Object> pageInventoryOutDetail(DrpInventoryIntoDetailQueryDTO queryDTO) {
         SysUser currentUser = SecurityUtils.getLoginUser().getSysUser();
         List<Long> warehouseAuthority = drpInventoryIntoDetailMapper.getTenantWarehouseIds(currentUser.getUserId());
-        List<Long> areaAuth = drpInventoryIntoDetailMapper.getTenantAreaIds(currentUser.getUserId());
+       // List<Long> areaAuth = drpInventoryIntoDetailMapper.getTenantAreaIds(currentUser.getUserId());
         PageHelper.startPage(queryDTO);
         DrpInventoryIntoDetailWrapper wrapper = new DrpInventoryIntoDetailWrapper();
         wrapper.setParam(queryDTO);
         wrapper.setWarehouseAuthority(warehouseAuthority);
-        wrapper.setAreaAuth(areaAuth);
+        wrapper.setAreaAuth(null);
         List<DrpInventoryoutDetailVO> drpInventoryoutDetailVOS = drpInventoryIntoDetailMapper.queryInventoryOutDetail(wrapper);
       /*  for ( DrpInventoryoutDetailVO c : drpInventoryoutDetailVOS) {
             try {
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml
index fd573777..65373f64 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml
@@ -219,214 +219,143 @@
     <select id="queryInventoryOutDetail"
             resultType="com.bonus.canteen.core.reportforms.beans.DrpInventoryoutDetailVO"
             parameterType="com.bonus.canteen.core.reportforms.beans.DrpInventoryIntoDetailWrapper">
-
         SELECT
         de.material_id,
-        mm.material_name as goods_name,
-        mm.material_code as goods_code,
+        mm.material_name        AS goods_name,
+        mm.material_code        AS goods_code,
         mmc.category_id,
-        mmc.category_name as goods_category_name,
+        mmc.category_name       AS goods_category_name,
         de.unit_id,
         du.unit_name,
-        de.unit_price as price,
+        de.unit_price           AS price,
         aa.area_name,
         dw.warehouse_id,
         dw.warehouse_name,
-        de.out_into_type intoType,
-        de.fetch_user_id as supplier_id,
-        null as supplier_name,
-        de.record_time intoDate,
-        de.out_into_num intoNum,
-        de.inventory_num balance_num,
-        de.out_into_amount intoAmount,
-        de.total_amount balance_amount,
-        de.fetch_user_id as operator_id,
-        IF(mu.real_name IS NULL OR mu.real_name = '', mu.username, mu.real_name) operatorName,
-        de.product_date as production_date,
-        de.expire_time as expiry_date,
+        de.out_into_type        AS intoType,
+        de.fetch_user_id        AS supplier_id,
+        NULL                    AS supplier_name,
+        de.record_time          AS intoDate,
+
+        -- 数量：退单为负
+        CASE
+        WHEN de.record_type = 1 AND de.out_into_type = 6
+        THEN -de.out_into_num
+        ELSE de.out_into_num
+        END                     AS intoNum,
+
+        de.inventory_num        AS balance_num,
+
+        -- 金额：退单为负
+        CASE
+        WHEN de.record_type = 1 AND de.out_into_type = 6
+        THEN -de.out_into_amount
+        ELSE de.out_into_amount
+        END                     AS intoAmount,
+
+        de.total_amount         AS balance_amount,
+        de.fetch_user_id        AS operator_id,
+        IF(mu.real_name IS NULL OR mu.real_name = '',
+        mu.username,
+        mu.real_name)        AS operatorName,
+        de.product_date         AS production_date,
+        de.expire_time          AS expiry_date,
         de.record_id,
-        mm.size as specification,
-        0 as record_type_flag  -- 0表示正常入库记录
-        from report_drp_inventory_base de
+        mm.size                 AS specification,
+
+        -- 标识：1=退单，0=正常
+        CASE
+        WHEN de.record_type = 1 AND de.out_into_type = 6
+        THEN 1
+        ELSE 0
+        END                     AS record_type_flag
+
+        FROM report_drp_inventory_base de
         LEFT JOIN menu_material mm ON de.material_id = mm.material_id
         LEFT JOIN drp_unit du ON de.unit_id = du.unit_id
         LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id
-        left join drp_warehouse dw on dw.warehouse_id = de.warehouse_id
-        left join alloc_area aa on aa.area_id = dw.area_id
+        LEFT JOIN drp_warehouse dw ON dw.warehouse_id = de.warehouse_id
+        LEFT JOIN alloc_area aa ON aa.area_id = dw.area_id
         LEFT JOIN mgr_user mu ON de.fetch_user_id = mu.user_id
-        where de.record_type = 2 and de.out_into_type in (1,3,5,6)
+
+        WHERE
+        (
+        -- 正常入库
+        (de.record_type = 2 AND de.out_into_type IN (1,3,5,6))
+
+        OR
+
+        -- 超市退单（直接负数，不依赖 order_info/order_refund）
+        (de.record_type = 1 AND de.out_into_type = 6)
+        )
 
         <if test="param.startDate != null">
-            and de.record_date >= #{param.startDate}
+            AND de.record_date >= #{param.startDate}
         </if>
         <if test="param.endDate != null">
-            and de.record_date &lt;= #{param.endDate}
+            AND de.record_date &lt;= #{param.endDate}
         </if>
 
         <if test="param.supplierIdList != null and param.supplierIdList.size() > 0">
-            and de.fetch_user_id in
+            AND de.fetch_user_id IN
             <foreach collection="param.supplierIdList" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
 
         <if test="param.materialName != null and param.materialName != ''">
-            and (mm.material_name like concat('%', #{param.materialName}, '%')
-            or mm.material_code like concat('%', #{param.materialName}, '%'))
+            AND (mm.material_name LIKE CONCAT('%', #{param.materialName}, '%')
+            OR mm.material_code LIKE CONCAT('%', #{param.materialName}, '%'))
         </if>
 
         <if test="param.categoryIdList != null and param.categoryIdList.size() > 0">
-            and mmc.category_id in
+            AND mmc.category_id IN
             <foreach collection="param.categoryIdList" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
 
         <if test="param.intoTypeList != null and param.intoTypeList.size() > 0">
-            and de.out_into_type in
+            AND de.out_into_type IN
             <foreach collection="param.intoTypeList" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
 
         <if test="param.recordId != null and param.recordId != ''">
-            and de.record_id like concat('%', #{param.recordId}, '%')
+            AND de.record_id LIKE CONCAT('%', #{param.recordId}, '%')
         </if>
 
         <if test="param.areaIdList != null and param.areaIdList.size() > 0">
-            and dw.area_id in
+            AND dw.area_id IN
             <foreach collection="param.areaIdList" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
 
         <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
-            and dw.warehouse_id in
+            AND dw.warehouse_id IN
             <foreach collection="param.warehouseIdList" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
 
         <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
-            and dw.warehouse_id in
+            AND dw.warehouse_id IN
             <foreach collection="warehouseAuthority" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
 
         <if test="areaAuth != null and areaAuth.size() > 0">
-            and dw.area_id in
+            AND dw.area_id IN
             <foreach collection="areaAuth" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
 
-        UNION ALL
+        ORDER BY record_type_flag DESC, intoDate DESC
 
-        -- 退款记录（负数）
-        SELECT
-        de.material_id,
-        mm.material_name as goods_name,
-        mm.material_code as goods_code,
-        mmc.category_id,
-        mmc.category_name as goods_category_name,
-        de.unit_id,
-        du.unit_name,
-        de.unit_price as price,
-        aa.area_name,
-        dw.warehouse_id,
-        dw.warehouse_name,
-        de.out_into_type intoType,
-        de.fetch_user_id as supplier_id,
-        null as supplier_name,
-        de.record_time intoDate,
-        de.out_into_num intoNum,  -- 负值表示退款
-        de.inventory_num balance_num,
-        -de.out_into_amount intoAmount,  -- 负值表示退款
-        de.total_amount balance_amount,
-        de.fetch_user_id as operator_id,
-        IF(mu.real_name IS NULL OR mu.real_name = '', mu.username, mu.real_name) operatorName,
-        de.product_date as production_date,
-        de.expire_time as expiry_date,
-        de.record_id,
-        mm.size as specification,
-        1 as record_type_flag  -- 1表示退款记录
-        from report_drp_inventory_base de
-        LEFT JOIN menu_material mm ON de.material_id = mm.material_id
-        LEFT JOIN drp_unit du ON de.unit_id = du.unit_id
-        LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id
-        left join drp_warehouse dw on dw.warehouse_id = de.warehouse_id
-        left join alloc_area aa on aa.area_id = dw.area_id
-        LEFT JOIN mgr_user mu ON de.fetch_user_id = mu.user_id
-        INNER JOIN order_info oi ON oi.inventory_out_id = de.record_id  -- 关联order_info
-        INNER JOIN order_refund rr ON rr.order_id = oi.order_id AND rr.check_state = 2  -- 关联order_refund，只查询已审核的退款
-        where de.record_type = 2 and de.out_into_type in (1,3,5,6)
-
-        <if test="param.startDate != null">
-            and rr.apply_time >= #{param.startDate}  -- 退款申请时间条件
-        </if>
-        <if test="param.endDate != null">
-            and rr.apply_time &lt;= #{param.endDate}  -- 退款申请时间条件
-        </if>
-
-        <if test="param.supplierIdList != null and param.supplierIdList.size() > 0">
-            and de.fetch_user_id in
-            <foreach collection="param.supplierIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="param.materialName != null and param.materialName != ''">
-            and (mm.material_name like concat('%', #{param.materialName}, '%')
-            or mm.material_code like concat('%', #{param.materialName}, '%'))
-        </if>
-
-        <if test="param.categoryIdList != null and param.categoryIdList.size() > 0">
-            and mmc.category_id in
-            <foreach collection="param.categoryIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="param.intoTypeList != null and param.intoTypeList.size() > 0">
-            and de.out_into_type in
-            <foreach collection="param.intoTypeList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="param.recordId != null and param.recordId != ''">
-            and de.record_id like concat('%', #{param.recordId}, '%')
-        </if>
-
-        <if test="param.areaIdList != null and param.areaIdList.size() > 0">
-            and dw.area_id in
-            <foreach collection="param.areaIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
-            and dw.warehouse_id in
-            <foreach collection="param.warehouseIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
-            and dw.warehouse_id in
-            <foreach collection="warehouseAuthority" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="areaAuth != null and areaAuth.size() > 0">
-            and dw.area_id in
-            <foreach collection="areaAuth" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-     </select>
+    </select>
 
     <!-- 获取租户仓库列表（带权限控制） -->
         <select id="getTenantWarehouse" resultMap="DrpWarehouseAllVOResult">
@@ -527,107 +456,45 @@
     <select id="queryInventoryIntoDocDetailoutSum"
             resultType="com.bonus.canteen.core.reportforms.beans.InventoryIntoSummaryVO">
         SELECT
-        SUM(intoNum) as totalInQty,
-        SUM(intoAmount) as totalInAmount,
-        -- 库存总计（直接从主表查询，不包含退款记录）
-        (SELECT SUM(de2.inventory_num)
-        FROM report_drp_inventory_base de2
-        LEFT JOIN menu_material mm2 ON de2.material_id = mm2.material_id
-        LEFT JOIN drp_warehouse dw2 ON de2.warehouse_id = dw2.warehouse_id
-        LEFT JOIN alloc_area aa2 ON aa2.area_id = dw2.area_id
-        WHERE de2.record_type = 2
-        AND de2.out_into_type IN (1,3,5,6)
-        <if test="param.startDate != null">
-            AND de2.record_date >= #{param.startDate}
-        </if>
-        <if test="param.endDate != null">
-            AND de2.record_date &lt;= #{param.endDate}
-        </if>
-        <if test="param.materialName != null and param.materialName != ''">
-            AND (mm2.material_name like concat('%', #{param.materialName}, '%')
-            OR mm2.material_code like concat('%', #{param.materialName}, '%'))
-        </if>
-        <if test="param.areaIdList != null and param.areaIdList.size() > 0">
-            AND dw2.area_id in
-            <foreach collection="param.areaIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-        <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
-            AND dw2.warehouse_id in
-            <foreach collection="param.warehouseIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-        <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
-            AND dw2.warehouse_id in
-            <foreach collection="warehouseAuthority" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-        <if test="areaAuth != null and areaAuth.size() > 0">
-            AND dw2.area_id in
-            <foreach collection="areaAuth" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-        ) as totalStockQty,
-        (SELECT SUM(de2.total_amount)
-        FROM report_drp_inventory_base de2
-        LEFT JOIN menu_material mm2 ON de2.material_id = mm2.material_id
-        LEFT JOIN drp_warehouse dw2 ON de2.warehouse_id = dw2.warehouse_id
-        LEFT JOIN alloc_area aa2 ON aa2.area_id = dw2.area_id
-        WHERE de2.record_type = 2
-        AND de2.out_into_type IN (1,3,5,6)
-        <if test="param.startDate != null">
-            AND de2.record_date >= #{param.startDate}
-        </if>
-        <if test="param.endDate != null">
-            AND de2.record_date &lt;= #{param.endDate}
-        </if>
-        <if test="param.materialName != null and param.materialName != ''">
-            AND (mm2.material_name like concat('%', #{param.materialName}, '%')
-            OR mm2.material_code like concat('%', #{param.materialName}, '%'))
-        </if>
-        <if test="param.areaIdList != null and param.areaIdList.size() > 0">
-            AND dw2.area_id in
-            <foreach collection="param.areaIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-        <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
-            AND dw2.warehouse_id in
-            <foreach collection="param.warehouseIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-        <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
-            AND dw2.warehouse_id in
-            <foreach collection="warehouseAuthority" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-        <if test="areaAuth != null and areaAuth.size() > 0">
-            AND dw2.area_id in
-            <foreach collection="areaAuth" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-        ) as totalStockAmount
+        SUM(combined.intoNum)       AS totalInQty,
+        SUM(combined.intoAmount)    AS totalInAmount,
+        SUM(combined.balance_num)   AS totalStockQty,
+        SUM(combined.balance_amount) AS totalStockAmount
         FROM (
-        -- 正常入库记录
+        -- 正常入库 + 退单负数
         SELECT
-        de.out_into_num as intoNum,
-        de.out_into_amount as intoAmount
+        -- 数量：退单为负
+        CASE
+        WHEN de.record_type = 1 AND de.out_into_type = 6
+        THEN -de.out_into_num
+        ELSE de.out_into_num
+        END AS intoNum,
+
+        -- 金额：退单为负
+        CASE
+        WHEN de.record_type = 1 AND de.out_into_type = 6
+        THEN -de.out_into_amount
+        ELSE de.out_into_amount
+        END AS intoAmount,
+
+        de.inventory_num AS balance_num,
+        de.total_amount  AS balance_amount
+
         FROM report_drp_inventory_base de
         LEFT JOIN menu_material mm ON de.material_id = mm.material_id
         LEFT JOIN drp_unit du ON de.unit_id = du.unit_id
         LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id
         LEFT JOIN drp_warehouse dw ON dw.warehouse_id = de.warehouse_id
         LEFT JOIN alloc_area aa ON aa.area_id = dw.area_id
-        LEFT JOIN mgr_user mu ON de.fetch_user_id = mu.user_id
-        WHERE de.record_type = 2
-        AND de.out_into_type IN (1,3,5,6)
+
+        WHERE
+        (
+        -- 正常入库
+        (de.record_type = 2 AND de.out_into_type IN (1,3,5,6))
+        OR
+        -- 退单
+        (de.record_type = 1 AND de.out_into_type = 6)
+        )
 
         <if test="param.startDate != null">
             AND de.record_date >= #{param.startDate}
@@ -636,148 +503,42 @@
             AND de.record_date &lt;= #{param.endDate}
         </if>
 
-        <if test="param.supplierIdList != null and param.supplierIdList.size() > 0">
-            AND de.fetch_user_id in
-            <foreach collection="param.supplierIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
         <if test="param.materialName != null and param.materialName != ''">
-            AND (mm.material_name like concat('%', #{param.materialName}, '%')
-            OR mm.material_code like concat('%', #{param.materialName}, '%'))
-        </if>
-
-        <if test="param.categoryIdList != null and param.categoryIdList.size() > 0">
-            AND mmc.category_id in
-            <foreach collection="param.categoryIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="param.intoTypeList != null and param.intoTypeList.size() > 0">
-            AND de.out_into_type in
-            <foreach collection="param.intoTypeList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="param.recordId != null and param.recordId != ''">
-            AND de.record_id like concat('%', #{param.recordId}, '%')
+            AND (mm.material_name LIKE CONCAT('%', #{param.materialName}, '%')
+            OR mm.material_code LIKE CONCAT('%', #{param.materialName}, '%'))
         </if>
 
         <if test="param.areaIdList != null and param.areaIdList.size() > 0">
-            AND dw.area_id in
+            AND dw.area_id IN
             <foreach collection="param.areaIdList" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
 
         <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
-            AND dw.warehouse_id in
+            AND dw.warehouse_id IN
             <foreach collection="param.warehouseIdList" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
 
         <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
-            AND dw.warehouse_id in
+            AND dw.warehouse_id IN
             <foreach collection="warehouseAuthority" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
 
         <if test="areaAuth != null and areaAuth.size() > 0">
-            AND dw.area_id in
+            AND dw.area_id IN
             <foreach collection="areaAuth" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
 
-        UNION ALL
+        ) AS combined
 
-        -- 退款记录（负数）
-        SELECT
-        de.out_into_num as intoNum,  -- 注意：这里需要改成负数，或者保持正数在外部处理
-        -de.out_into_amount as intoAmount  -- 金额为负数
-        FROM report_drp_inventory_base de
-        LEFT JOIN menu_material mm ON de.material_id = mm.material_id
-        LEFT JOIN drp_unit du ON de.unit_id = du.unit_id
-        LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id
-        LEFT JOIN drp_warehouse dw ON dw.warehouse_id = de.warehouse_id
-        LEFT JOIN alloc_area aa ON aa.area_id = dw.area_id
-        LEFT JOIN mgr_user mu ON de.fetch_user_id = mu.user_id
-        INNER JOIN order_info oi ON oi.inventory_out_id = de.record_id
-        INNER JOIN order_refund rr ON rr.order_id = oi.order_id AND rr.check_state = 2
-        WHERE de.record_type = 2
-        AND de.out_into_type IN (1,3,5,6)
-
-        <if test="param.startDate != null">
-            AND rr.apply_time >= #{param.startDate}
-        </if>
-        <if test="param.endDate != null">
-            AND rr.apply_time &lt;= #{param.endDate}
-        </if>
-
-        <if test="param.supplierIdList != null and param.supplierIdList.size() > 0">
-            AND de.fetch_user_id in
-            <foreach collection="param.supplierIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="param.materialName != null and param.materialName != ''">
-            AND (mm.material_name like concat('%', #{param.materialName}, '%')
-            OR mm.material_code like concat('%', #{param.materialName}, '%'))
-        </if>
-
-        <if test="param.categoryIdList != null and param.categoryIdList.size() > 0">
-            AND mmc.category_id in
-            <foreach collection="param.categoryIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="param.intoTypeList != null and param.intoTypeList.size() > 0">
-            AND de.out_into_type in
-            <foreach collection="param.intoTypeList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="param.recordId != null and param.recordId != ''">
-            AND de.record_id like concat('%', #{param.recordId}, '%')
-        </if>
-
-        <if test="param.areaIdList != null and param.areaIdList.size() > 0">
-            AND dw.area_id in
-            <foreach collection="param.areaIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
-            AND dw.warehouse_id in
-            <foreach collection="param.warehouseIdList" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
-            AND dw.warehouse_id in
-            <foreach collection="warehouseAuthority" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-
-        <if test="areaAuth != null and areaAuth.size() > 0">
-            AND dw.area_id in
-            <foreach collection="areaAuth" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
-        ) AS combined_data
- </select>
+    </select>
 
 </mapper>
 
diff --git a/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/DrpInventorMapper.xml b/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/DrpInventorMapper.xml
new file mode 100644
index 00000000..bf2952fb
--- /dev/null
+++ b/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/DrpInventorMapper.xml
@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.bonus.canteen.core.reportforms.mapper.DrpInventoryhzMapper">
+        <!-- 结果映射：库存入库明细VO -->
+        <resultMap type="com.bonus.canteen.core.reportforms.beans.DrpInventoryIntoDetailVO" id="DrpInventoryIntoDetailVOResult">
+            <result property="recordId" column="record_id" />
+            <result property="areaName" column="area_name" />
+            <result property="warehouseId" column="warehouse_id" />
+            <result property="warehouseName" column="warehouse_name" />
+            <result property="intoType" column="intoType" />
+            <result property="intoDate" column="intoDate" />
+            <result property="intoNum" column="intoNum" />
+            <result property="intoAmount" column="intoAmount" />
+            <result property="operatorId" column="operator_id" />
+            <result property="operatorName" column="operatorName" />
+            <result property="goodsCode" column="goods_code" />
+            <result property="goodsCategory" column="goods_category" />
+            <result property="goodsCategoryName" column="goods_category_name" />
+            <result property="goodsName" column="goods_name" />
+            <result property="unitName" column="unit_name" />
+            <result property="specification" column="specification" />
+            <result property="price" column="price" />
+            <result property="supplierId" column="supplier_id" />
+            <result property="supplierName" column="supplier_name" />
+            <result property="balanceNum" column="balance_num" />
+            <result property="balanceAmount" column="balance_amount" />
+            <result property="productionDate" column="production_date" />
+            <result property="expiryDate" column="expiry_date" />
+        </resultMap>
+    <select id="pageInventoryIntoDetail"
+            resultType="com.bonus.canteen.core.reportforms.beans.InventoryGoodsSummaryVO">
+        SELECT
+            t.warehouse_name,
+            t.area_name,
+            t.material_id,
+            t.material_name,
+            t.material_code,
+            t.category_id,
+            t.category_name,
+            t.unit_id,
+            t.unit_name,
+            t.size,
+            SUM(t.into_num) intoTotalNum,
+            SUM(t.into_amount) intoTotalAmount,
+            SUM(t.out_num) outTotalNum,
+            SUM(t.out_amount) outTotalAmount
+            FROM
+            (
+            SELECT
+            aa.area_name,
+            dw.warehouse_name,
+            ds.material_id,
+            mm.material_name,
+            mm.material_code,
+            mmc.category_id,
+            mmc.category_name,
+            ds.unit_id,
+            du.unit_name,
+            mm.size,
+            dw.warehouse_id,
+            SUM(ds.into_num) into_num,
+            SUM(ds.into_amount) into_amount,
+            SUM(ds.out_num) out_num,
+            SUM(ds.out_amount) out_amount
+            FROM
+            report_drp_inventory_summary ds
+            LEFT JOIN menu_material mm ON ds.material_id = mm.material_id
+            LEFT JOIN drp_unit du ON ds.unit_id = du.unit_id
+            LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id
+            LEFT JOIN drp_warehouse dw ON dw.warehouse_id = ds.warehouse_id
+            left join alloc_area aa on aa.area_id = dw.area_id
+        <where>
+            <if test="param.startDate != null">
+                and ds.statistic_date <![CDATA[ >= ]]> #{param.startDate}
+            </if>
+            <if test="param.endDate != null">
+                and ds.statistic_date <![CDATA[ <= ]]> #{param.endDate}
+            </if>
+            <if test="param.materialName != null and param.materialName != ''">
+                and (mm.material_name like concat('%', #{param.materialName}, '%')
+                or mm.material_code like concat('%', #{param.materialName}, '%')
+                )
+            </if>
+            <if test="param.categoryIdList != null and param.categoryIdList.size() > 0">
+                AND mmc.category_id in
+                <foreach collection="param.categoryIdList" item="categoryId" separator="," open="("
+                         close=")">
+                    #{categoryId}
+                </foreach>
+            </if>
+            <if test="param.areaIdList != null and param.areaIdList.size() > 0">
+                AND dw.area_id in
+                <foreach collection="param.areaIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
+                AND dw.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="warehouseId" separator="," open="("
+                         close=")">
+                    #{warehouseId}
+                </foreach>
+            </if>
+            <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
+                and dw.warehouse_id in
+                <foreach collection="warehouseAuthority" item="warehouseId" separator="," open="(" close=")">
+                    #{warehouseId}
+                </foreach>
+            </if>
+            <if test="areaAuth != null and areaAuth.size() > 0">
+                and dw.area_id in
+                <foreach collection="areaAuth" item="areaId" separator="," open="(" close=")">
+                    #{areaId}
+                </foreach>
+            </if>
+        </where>
+        group by ds.material_id,
+        mm.material_name,
+        mm.material_code,
+        mmc.category_id,
+        mmc.category_name,
+        ds.unit_id,
+        du.unit_name,
+        mm.size,
+        dw.warehouse_id,
+        dw.warehouse_name
+        ) t
+        group by t.material_id,
+        t.material_name,
+        t.material_code,
+        t.category_id,
+        t.category_name,
+        t.unit_id,
+        t.unit_name,
+        t.size
+
+
+    </select>
+    <select id="queryInventoryIntoDocDetailSum"
+            resultType="com.bonus.canteen.core.reportforms.beans.InventoryIntoSummaryVO">
+        SELECT
+        SUM(ds.into_num) as intoTotalNum,
+        SUM(ds.into_amount) as intoTotalAmount,
+        SUM(ds.out_num) as outTotalNum,
+        SUM(ds.out_amount) as outTotalAmount
+        FROM
+        report_drp_inventory_summary ds
+        LEFT JOIN menu_material mm ON ds.material_id = mm.material_id
+        LEFT JOIN drp_unit du ON ds.unit_id = du.unit_id
+        LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id
+        LEFT JOIN drp_warehouse dw ON dw.warehouse_id = ds.warehouse_id
+        LEFT JOIN alloc_area aa ON aa.area_id = dw.area_id
+        <where>
+            <if test="param.startDate != null">
+                and ds.statistic_date <![CDATA[ >= ]]> #{param.startDate}
+            </if>
+            <if test="param.endDate != null">
+                and ds.statistic_date <![CDATA[ <= ]]> #{param.endDate}
+            </if>
+            <if test="param.materialName != null and param.materialName != ''">
+                and (mm.material_name like concat('%', #{param.materialName}, '%')
+                or mm.material_code like concat('%', #{param.materialName}, '%')
+                )
+            </if>
+            <if test="param.categoryIdList != null and param.categoryIdList.size() > 0">
+                AND mmc.category_id in
+                <foreach collection="param.categoryIdList" item="categoryId" separator="," open="("
+                         close=")">
+                    #{categoryId}
+                </foreach>
+            </if>
+            <if test="param.areaIdList != null and param.areaIdList.size() > 0">
+                AND dw.area_id in
+                <foreach collection="param.areaIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
+                AND dw.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="warehouseId" separator="," open="("
+                         close=")">
+                    #{warehouseId}
+                </foreach>
+            </if>
+            <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
+                and dw.warehouse_id in
+                <foreach collection="warehouseAuthority" item="warehouseId" separator="," open="(" close=")">
+                    #{warehouseId}
+                </foreach>
+            </if>
+            <if test="areaAuth != null and areaAuth.size() > 0">
+                and dw.area_id in
+                <foreach collection="areaAuth" item="areaId" separator="," open="(" close=")">
+                    #{areaId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="queryInventoryWarehouseSummaryList"
+            resultType="com.bonus.canteen.core.reportforms.beans.ReportDrpInventoryWarehouseSummaryVO">
+        select
+        aa.area_name,
+        dw.warehouse_id,
+        dw.warehouse_name,
+        sum(ds.into_num) intoTotalNum,
+        sum(ds.into_amount) intoTotalAmount,
+        sum(ds.out_num) outTotalNum,
+        sum(ds.out_amount) outTotalAmount
+        from report_drp_inventory_summary ds
+        left join drp_warehouse dw on dw.warehouse_id = ds.warehouse_id
+        left join alloc_area aa on aa.area_id = dw.area_id
+        <where>
+            <if test="param.startDate != null">
+                and ds.statistic_date <![CDATA[ >= ]]> #{param.startDate}
+            </if>
+            <if test="param.endDate != null">
+                and ds.statistic_date <![CDATA[ <= ]]> #{param.endDate}
+            </if>
+            <if test="param.areaIdList != null and param.areaIdList.size() > 0">
+                AND dw.area_id in
+                <foreach collection="param.areaIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
+                AND dw.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="warehouseId" separator="," open="("
+                         close=")">
+                    #{warehouseId}
+                </foreach>
+            </if>
+            <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
+                and dw.warehouse_id in
+                <foreach collection="warehouseAuthority" item="warehouseId" separator="," open="(" close=")">
+                    #{warehouseId}
+                </foreach>
+            </if>
+            <if test="areaAuth != null and areaAuth.size() > 0">
+                and dw.area_id in
+                <foreach collection="areaAuth" item="areaId" separator="," open="(" close=")">
+                    #{areaId}
+                </foreach>
+            </if>
+        </where>
+        group by aa.area_name, dw.warehouse_id,
+        dw.warehouse_name
+    </select>
+    <select id="queryInventoryWarehouseSummarySum"
+            resultType="com.bonus.canteen.core.reportforms.beans.InventoryIntoSummaryVO">
+        SELECT
+        SUM(ds.into_num) AS intoTotalNum,
+        SUM(ds.into_amount) AS intoTotalAmount,
+        SUM(ds.out_num) AS outTotalNum,
+        SUM(ds.out_amount) AS outTotalAmount
+        FROM report_drp_inventory_summary ds
+        LEFT JOIN drp_warehouse dw ON dw.warehouse_id = ds.warehouse_id
+        LEFT JOIN alloc_area aa ON aa.area_id = dw.area_id
+        <where>
+            <if test="param.startDate != null">
+                AND ds.statistic_date <![CDATA[ >= ]]> #{param.startDate}
+            </if>
+            <if test="param.endDate != null">
+                AND ds.statistic_date <![CDATA[ <= ]]> #{param.endDate}
+            </if>
+            <if test="param.areaIdList != null and param.areaIdList.size() > 0">
+                AND dw.area_id IN
+                <foreach collection="param.areaIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
+                AND dw.warehouse_id IN
+                <foreach collection="param.warehouseIdList" item="warehouseId" separator="," open="(" close=")">
+                    #{warehouseId}
+                </foreach>
+            </if>
+            <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
+                AND dw.warehouse_id IN
+                <foreach collection="warehouseAuthority" item="warehouseId" separator="," open="(" close=")">
+                    #{warehouseId}
+                </foreach>
+            </if>
+            <if test="areaAuth != null and areaAuth.size() > 0">
+                AND dw.area_id IN
+                <foreach collection="areaAuth" item="areaId" separator="," open="(" close=")">
+                    #{areaId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="queryInventorySupplierSummaryList"
+            resultType="com.bonus.canteen.core.reportforms.beans.InventoryGoodsSummaryVO">
+
+        select t.supplier_id,
+        t.supplier_name as supplierName,
+        sum(t.into_num)  as intoNum,
+        sum(t.into_amount)  as intoAmount,
+        sum(t.out_num)   as outNum,
+        sum(t.out_amount)  as outAmount
+        from (select ifnull(dsl.supplier_id, ds.supplier_id) supplier_id,
+        ifnull(dsl.supplier_name, '透支出库') supplier_name,
+        dw.warehouse_id,
+        dw.warehouse_name as warehouseName,
+        sum(ds.into_num)    into_num,
+        sum(ds.into_amount) into_amount,
+        sum(ds.out_num)     out_num,
+        sum(ds.out_amount)  out_amount
+        from report_drp_inventory_summary ds
+        LEFT JOIN drp_supplier dsl ON ds.supplier_id = dsl.supplier_id
+        LEFT JOIN drp_warehouse dw ON dw.warehouse_id = ds.warehouse_id
+        <where>
+            <if test="param.startDate != null">
+                and ds.statistic_date <![CDATA[ >= ]]> #{param.startDate}
+            </if>
+            <if test="param.endDate != null">
+                and ds.statistic_date <![CDATA[ <= ]]> #{param.endDate}
+            </if>
+            <if test="param.supplierIdList != null and param.supplierIdList.size() > 0">
+                AND dsl.supplier_id in
+                <foreach collection="param.supplierIdList" item="supplierId" separator="," open="("
+                         close=")">
+                    #{supplierId}
+                </foreach>
+            </if>
+            <if test="param.areaIdList != null and param.areaIdList.size() > 0">
+                AND dw.area_id in
+                <foreach collection="param.areaIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
+                AND dw.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="warehouseId" separator="," open="("
+                         close=")">
+                    #{warehouseId}
+                </foreach>
+            </if>
+            <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
+                and dw.warehouse_id in
+                <foreach collection="warehouseAuthority" item="warehouseId" separator="," open="(" close=")">
+                    #{warehouseId}
+                </foreach>
+            </if>
+            <if test="areaAuth != null and areaAuth.size() > 0">
+                and dw.area_id in
+                <foreach collection="areaAuth" item="areaId" separator="," open="(" close=")">
+                    #{areaId}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY supplier_id, supplier_name, dw.warehouse_id,
+        dw.warehouse_name) t
+        GROUP BY t.supplier_id, t.supplier_name
+
+
+    </select>
+    <select id="queryWarehouseInventorySupplierSummaryList"
+            resultType="com.bonus.canteen.core.reportforms.beans.InventoryGoodsSummaryVO">
+     select
+        ds.supplier_id,
+        dsl.supplier_name  as supplierName,
+        aa.area_name,
+        dw.warehouse_id,
+        dw.warehouse_name,
+        sum(ds.into_num)    as intoNum,
+        sum(ds.into_amount) as intoAmount,
+        sum(ds.out_num)     as outNum,
+        sum(ds.out_amount)  as outAmount
+        from report_drp_inventory_summary ds
+        LEFT JOIN drp_supplier dsl ON ds.supplier_id = dsl.supplier_id
+        LEFT JOIN drp_warehouse dw ON dw.warehouse_id = ds.warehouse_id
+        LEFT JOIN alloc_area aa ON aa.area_id = dw.area_id
+        <where>
+            <if test="wrapper.param.startDate != null">
+                and ds.statistic_date <![CDATA[ >= ]]> #{wrapper.param.startDate}
+            </if>
+
+            <if test="wrapper.param.endDate != null">
+                and ds.statistic_date <![CDATA[ <= ]]> #{wrapper.param.endDate}
+            </if>
+
+            <if test="idList != null and idList.size() > 0">
+                and ds.supplier_id in
+                <foreach collection="idList" item="supplierId" open="(" close=")" separator=",">
+                    #{supplierId}
+                </foreach>
+            </if>
+
+            <if test="wrapper.param.areaIdList != null and wrapper.param.areaIdList.size() > 0">
+                and dw.area_id in
+                <foreach collection="wrapper.param.areaIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="wrapper.param.warehouseIdList != null and wrapper.param.warehouseIdList.size() > 0">
+                and dw.warehouse_id in
+                <foreach collection="wrapper.param.warehouseIdList" item="warehouseId" open="(" close=")" separator=",">
+                    #{warehouseId}
+                </foreach>
+            </if>
+
+            <if test="wrapper.warehouseAuthority != null and wrapper.warehouseAuthority.size() > 0">
+                and dw.warehouse_id in
+                <foreach collection="wrapper.warehouseAuthority" item="warehouseId" open="(" close=")" separator=",">
+                    #{warehouseId}
+                </foreach>
+            </if>
+
+            <if test="wrapper.areaAuth != null and wrapper.areaAuth.size() > 0">
+                and dw.area_id in
+                <foreach collection="wrapper.areaAuth" item="areaId" open="(" close=")" separator=",">
+                    #{areaId}
+                </foreach>
+            </if>
+        </where>
+
+        GROUP BY ds.supplier_id, aa.area_name, dw.warehouse_id,
+        dw.warehouse_name
+    </select>
+
+
+</mapper>
+
diff --git a/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml b/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml
new file mode 100644
index 00000000..65373f64
--- /dev/null
+++ b/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml
@@ -0,0 +1,544 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.bonus.canteen.core.reportforms.mapper.DrpInventoryIntoDetailMapper">
+        <!-- 结果映射：库存入库明细VO -->
+        <resultMap type="com.bonus.canteen.core.reportforms.beans.DrpInventoryIntoDetailVO" id="DrpInventoryIntoDetailVOResult">
+            <result property="recordId" column="record_id" />
+            <result property="areaName" column="area_name" />
+            <result property="warehouseId" column="warehouse_id" />
+            <result property="warehouseName" column="warehouse_name" />
+            <result property="intoType" column="intoType" />
+            <result property="intoDate" column="intoDate" />
+            <result property="intoNum" column="intoNum" />
+            <result property="intoAmount" column="intoAmount" />
+            <result property="operatorId" column="operator_id" />
+            <result property="operatorName" column="operatorName" />
+            <result property="goodsCode" column="goods_code" />
+            <result property="goodsCategory" column="goods_category" />
+            <result property="goodsCategoryName" column="goods_category_name" />
+            <result property="goodsName" column="goods_name" />
+            <result property="unitName" column="unit_name" />
+            <result property="specification" column="specification" />
+            <result property="price" column="price" />
+            <result property="supplierId" column="supplier_id" />
+            <result property="supplierName" column="supplier_name" />
+            <result property="balanceNum" column="balance_num" />
+            <result property="balanceAmount" column="balance_amount" />
+            <result property="productionDate" column="production_date" />
+            <result property="expiryDate" column="expiry_date" />
+        </resultMap>
+
+        <!-- 结果映射：仓库VO -->
+        <resultMap type="com.bonus.canteen.core.reportforms.beans.DrpWarehouseAllVO" id="DrpWarehouseAllVOResult">
+            <result property="warehouseId" column="warehouse_id" />
+            <result property="areaId" column="area_id" />
+            <result property="warehouseName" column="warehouse_name" />
+        </resultMap>
+
+        <!-- 查询库存入库明细列表 -->
+        <select id="queryInventoryIntoDocDetail" resultMap="DrpInventoryIntoDetailVOResult"
+                parameterType="com.bonus.canteen.core.reportforms.beans.DrpInventoryIntoDetailWrapper" >
+            select de.material_id,
+            mm.material_name as goods_name,
+            mm.material_code as goods_code,
+            mmc.category_id,
+            mmc.category_name as goods_category_name,
+            de.unit_id,
+            du.unit_name,
+            de.unit_price as price,
+            aa.area_name,
+            dw.warehouse_id,
+            dw.warehouse_name,
+            de.out_into_type intoType,
+            de.supplier_id,
+            ds.supplier_name,
+            de.record_time intoDate,
+            de.out_into_num intoNum,
+            de.inventory_num balance_num,
+            de.out_into_amount intoAmount,
+            de.total_amount balance_amount,
+            de.operator_id,
+            IF
+            (mu.real_name IS NULL OR mu.real_name = '', mu.username, mu.real_name) operatorName,
+            de.product_date as production_date,
+            de.expire_time as expiry_date,
+            de.record_id,
+            mm.size as specification
+            from report_drp_inventory_base de
+            LEFT JOIN menu_material mm ON de.material_id = mm.material_id
+            LEFT JOIN drp_unit du ON de.unit_id = du.unit_id
+            LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id
+            left join drp_warehouse dw on dw.warehouse_id = de.warehouse_id
+            left join alloc_area aa on aa.area_id = dw.area_id
+            LEFT JOIN drp_supplier ds ON de.supplier_id = ds.supplier_id
+            LEFT JOIN mgr_user mu ON de.operator_id = mu.username
+            where de.record_type=1 and de.out_into_type in (1, 5)
+            <if test="param.startDate != null">
+                and de.record_date >= #{param.startDate}
+            </if>
+
+            <if test="param.endDate != null">
+                and de.record_date &lt;=  #{param.endDate}
+            </if>
+
+            <if test="param.supplierIdList != null and param.supplierIdList.size() > 0">
+                and de.supplier_id in
+                <foreach collection="param.supplierIdList" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+
+            <if test="param.materialName != null and param.materialName != ''">
+                and (mm.material_name like concat('%', #{param.materialName}, '%')
+                or mm.material_code like concat('%', #{param.materialName}, '%'))
+            </if>
+
+            <if test="param.categoryIdList != null and param.categoryIdList.size() > 0">
+                and mmc.category_id in
+                <foreach collection="param.categoryIdList" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+
+            <if test="param.intoTypeList != null and param.intoTypeList.size() > 0">
+                and de.out_into_type in
+                <foreach collection="param.intoTypeList" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+
+            <if test="param.recordId != null and param.recordId != ''">
+                and de.record_id like concat('%', #{param.recordId}, '%')
+            </if>
+
+            <if test="param.areaIdList != null and param.areaIdList.size() > 0">
+                and dw.area_id in
+                <foreach collection="param.areaIdList" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+
+            <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
+                and dw.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+
+            <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
+                and dw.warehouse_id in
+                <foreach collection="warehouseAuthority" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+
+            <if test="areaAuth != null and areaAuth.size() > 0">
+                and dw.area_id in
+                <foreach collection="areaAuth" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+        </select>
+    <!-- 查询库存入库明细合计 -->
+    <select id="queryInventoryIntoDocDetailSum" resultType="com.bonus.canteen.core.reportforms.beans.InventoryIntoSummaryVO"
+            parameterType="com.bonus.canteen.core.reportforms.beans.DrpInventoryIntoDetailWrapper">
+
+        SELECT
+        SUM(de.out_into_num) as totalInQty,
+        SUM(de.out_into_amount) as totalInAmount,
+        SUM(de.inventory_num) as totalStockQty,
+        SUM(de.total_amount) as totalStockAmount
+        FROM report_drp_inventory_base de
+        LEFT JOIN menu_material mm ON de.material_id = mm.material_id
+        LEFT JOIN drp_unit du ON de.unit_id = du.unit_id
+        LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id
+        LEFT JOIN drp_warehouse dw ON dw.warehouse_id = de.warehouse_id
+        LEFT JOIN alloc_area aa ON aa.area_id = dw.area_id
+        LEFT JOIN drp_supplier ds ON de.supplier_id = ds.supplier_id
+        LEFT JOIN mgr_user mu ON de.operator_id = mu.username
+        WHERE de.record_type=1 AND de.out_into_type IN (1,5)
+
+        <!-- 以下条件和明细保持一模一样 -->
+        <if test="param.startDate != null">
+            AND de.record_date >= #{param.startDate}
+        </if>
+        <if test="param.endDate != null">
+            AND de.record_date &lt;= #{param.endDate}
+        </if>
+        <if test="param.supplierIdList != null and param.supplierIdList.size() > 0">
+            AND de.supplier_id IN
+            <foreach collection="param.supplierIdList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="param.materialName != null and param.materialName != ''">
+            AND (mm.material_name LIKE concat('%',#{param.materialName},'%')
+            OR mm.material_code LIKE concat('%',#{param.materialName},'%'))
+        </if>
+        <if test="param.categoryIdList != null and param.categoryIdList.size() > 0">
+            AND mmc.category_id IN
+            <foreach collection="param.categoryIdList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="param.intoTypeList != null and param.intoTypeList.size() > 0">
+            AND de.out_into_type IN
+            <foreach collection="param.intoTypeList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="param.recordId != null and param.recordId != ''">
+            AND de.record_id LIKE concat('%',#{param.recordId},'%')
+        </if>
+        <if test="param.areaIdList != null and param.areaIdList.size() > 0">
+            AND dw.area_id IN
+            <foreach collection="param.areaIdList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
+            AND dw.warehouse_id IN
+            <foreach collection="param.warehouseIdList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
+            AND dw.warehouse_id IN
+            <foreach collection="warehouseAuthority" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="areaAuth != null and areaAuth.size() > 0">
+            AND dw.area_id IN
+            <foreach collection="areaAuth" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="queryInventoryOutDetail"
+            resultType="com.bonus.canteen.core.reportforms.beans.DrpInventoryoutDetailVO"
+            parameterType="com.bonus.canteen.core.reportforms.beans.DrpInventoryIntoDetailWrapper">
+        SELECT
+        de.material_id,
+        mm.material_name        AS goods_name,
+        mm.material_code        AS goods_code,
+        mmc.category_id,
+        mmc.category_name       AS goods_category_name,
+        de.unit_id,
+        du.unit_name,
+        de.unit_price           AS price,
+        aa.area_name,
+        dw.warehouse_id,
+        dw.warehouse_name,
+        de.out_into_type        AS intoType,
+        de.fetch_user_id        AS supplier_id,
+        NULL                    AS supplier_name,
+        de.record_time          AS intoDate,
+
+        -- 数量：退单为负
+        CASE
+        WHEN de.record_type = 1 AND de.out_into_type = 6
+        THEN -de.out_into_num
+        ELSE de.out_into_num
+        END                     AS intoNum,
+
+        de.inventory_num        AS balance_num,
+
+        -- 金额：退单为负
+        CASE
+        WHEN de.record_type = 1 AND de.out_into_type = 6
+        THEN -de.out_into_amount
+        ELSE de.out_into_amount
+        END                     AS intoAmount,
+
+        de.total_amount         AS balance_amount,
+        de.fetch_user_id        AS operator_id,
+        IF(mu.real_name IS NULL OR mu.real_name = '',
+        mu.username,
+        mu.real_name)        AS operatorName,
+        de.product_date         AS production_date,
+        de.expire_time          AS expiry_date,
+        de.record_id,
+        mm.size                 AS specification,
+
+        -- 标识：1=退单，0=正常
+        CASE
+        WHEN de.record_type = 1 AND de.out_into_type = 6
+        THEN 1
+        ELSE 0
+        END                     AS record_type_flag
+
+        FROM report_drp_inventory_base de
+        LEFT JOIN menu_material mm ON de.material_id = mm.material_id
+        LEFT JOIN drp_unit du ON de.unit_id = du.unit_id
+        LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id
+        LEFT JOIN drp_warehouse dw ON dw.warehouse_id = de.warehouse_id
+        LEFT JOIN alloc_area aa ON aa.area_id = dw.area_id
+        LEFT JOIN mgr_user mu ON de.fetch_user_id = mu.user_id
+
+        WHERE
+        (
+        -- 正常入库
+        (de.record_type = 2 AND de.out_into_type IN (1,3,5,6))
+
+        OR
+
+        -- 超市退单（直接负数，不依赖 order_info/order_refund）
+        (de.record_type = 1 AND de.out_into_type = 6)
+        )
+
+        <if test="param.startDate != null">
+            AND de.record_date >= #{param.startDate}
+        </if>
+        <if test="param.endDate != null">
+            AND de.record_date &lt;= #{param.endDate}
+        </if>
+
+        <if test="param.supplierIdList != null and param.supplierIdList.size() > 0">
+            AND de.fetch_user_id IN
+            <foreach collection="param.supplierIdList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="param.materialName != null and param.materialName != ''">
+            AND (mm.material_name LIKE CONCAT('%', #{param.materialName}, '%')
+            OR mm.material_code LIKE CONCAT('%', #{param.materialName}, '%'))
+        </if>
+
+        <if test="param.categoryIdList != null and param.categoryIdList.size() > 0">
+            AND mmc.category_id IN
+            <foreach collection="param.categoryIdList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="param.intoTypeList != null and param.intoTypeList.size() > 0">
+            AND de.out_into_type IN
+            <foreach collection="param.intoTypeList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="param.recordId != null and param.recordId != ''">
+            AND de.record_id LIKE CONCAT('%', #{param.recordId}, '%')
+        </if>
+
+        <if test="param.areaIdList != null and param.areaIdList.size() > 0">
+            AND dw.area_id IN
+            <foreach collection="param.areaIdList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
+            AND dw.warehouse_id IN
+            <foreach collection="param.warehouseIdList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
+            AND dw.warehouse_id IN
+            <foreach collection="warehouseAuthority" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="areaAuth != null and areaAuth.size() > 0">
+            AND dw.area_id IN
+            <foreach collection="areaAuth" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        ORDER BY record_type_flag DESC, intoDate DESC
+
+    </select>
+
+    <!-- 获取租户仓库列表（带权限控制） -->
+        <select id="getTenantWarehouse" resultMap="DrpWarehouseAllVOResult">
+            SELECT
+            a.warehouse_id,
+            a.warehouse_name,
+            a.warehouse_num,
+            a.address,
+            a.fetch_user_id,
+            IF(mu.real_name IS NULL OR mu.real_name = '', mu.username, mu.real_name) AS fetchUserName
+            FROM drp_warehouse a
+            LEFT JOIN alloc_area aa ON aa.area_id = a.area_id
+            LEFT JOIN mgr_user mu ON a.fetch_user_id = mu.user_id
+            WHERE a.del_flag = 2
+            AND a.status = 2
+
+            <if test="areaAuth != null and areaAuth.length > 0">
+                AND (
+                a.area_id IN
+                <foreach collection="areaAuth" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                OR a.area_id IS NULL
+                )
+            </if>
+
+        </select>
+
+        <!-- 获取用户有权限的仓库ID列表 -->
+        <select id="getTenantWarehouseIds" resultType="java.lang.Long">
+            SELECT DISTINCT rw.warehouse_id
+            FROM mgr_role_warehouse rw
+                     JOIN mgr_role r ON rw.role_id = r.role_id
+            WHERE r.role_code = '-1'
+              AND r.del_flag = 2;
+
+        </select>
+
+        <!-- 获取用户有权限的区域ID列表 -->
+        <select id="getTenantAreaIds" resultType="java.lang.Long">
+            SELECT DISTINCT d.area_id
+            FROM drp_warehouse d
+            WHERE d.area_id IS NOT NULL
+        </select>
+
+        <!-- 获取供应商列表 -->
+        <select id="getSupplierList" resultType="com.bonus.canteen.core.reportforms.beans.DrpSupplierVO">
+            SELECT
+            ds.supplier_id,
+            ds.supplier_name,
+            ds.supplier_score,
+            ds.area_id,
+            aa.area_name
+            FROM
+            drp_supplier ds
+            LEFT JOIN alloc_area aa ON aa.area_id = ds.area_id
+            where ds.status = 2
+            and ds.del_flag = 2
+            <if test="content != null and content.size() > 0">
+                and (
+                ds.area_id in
+                <foreach collection="content" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+                or ds.area_id is null
+                )
+            </if>
+        </select>
+
+    <!-- 获取货品类别字典（树形结构） -->
+    <select id="getGoodsCategoryDict" resultType="com.bonus.canteen.core.reportforms.beans.DrpDictVO">
+        SELECT
+        mmc.category_id AS id,
+        CASE
+        WHEN mmc.area_id IS NOT NULL AND aa.area_name IS NOT NULL
+        THEN CONCAT(mmc.category_name, '（', aa.area_name, '）')
+        ELSE mmc.category_name
+        END AS dictLabel,
+        mmc.parent_id,
+        mmc.area_id,
+        mmc.category_type,
+        mmc.level
+        FROM menu_material_category mmc
+        LEFT JOIN alloc_area aa ON aa.area_id = mmc.area_id
+        WHERE mmc.del_flag = 2
+
+        <if test="areaAuth != null and areaAuth.size() > 0">
+            AND (
+            mmc.area_id IN
+            <foreach collection="areaAuth" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+            OR mmc.area_id IS NULL
+            )
+        </if>
+        ORDER BY parent_id, category_type, category_id
+    </select>
+    <select id="queryInventoryIntoDocDetailoutSum"
+            resultType="com.bonus.canteen.core.reportforms.beans.InventoryIntoSummaryVO">
+        SELECT
+        SUM(combined.intoNum)       AS totalInQty,
+        SUM(combined.intoAmount)    AS totalInAmount,
+        SUM(combined.balance_num)   AS totalStockQty,
+        SUM(combined.balance_amount) AS totalStockAmount
+        FROM (
+        -- 正常入库 + 退单负数
+        SELECT
+        -- 数量：退单为负
+        CASE
+        WHEN de.record_type = 1 AND de.out_into_type = 6
+        THEN -de.out_into_num
+        ELSE de.out_into_num
+        END AS intoNum,
+
+        -- 金额：退单为负
+        CASE
+        WHEN de.record_type = 1 AND de.out_into_type = 6
+        THEN -de.out_into_amount
+        ELSE de.out_into_amount
+        END AS intoAmount,
+
+        de.inventory_num AS balance_num,
+        de.total_amount  AS balance_amount
+
+        FROM report_drp_inventory_base de
+        LEFT JOIN menu_material mm ON de.material_id = mm.material_id
+        LEFT JOIN drp_unit du ON de.unit_id = du.unit_id
+        LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id
+        LEFT JOIN drp_warehouse dw ON dw.warehouse_id = de.warehouse_id
+        LEFT JOIN alloc_area aa ON aa.area_id = dw.area_id
+
+        WHERE
+        (
+        -- 正常入库
+        (de.record_type = 2 AND de.out_into_type IN (1,3,5,6))
+        OR
+        -- 退单
+        (de.record_type = 1 AND de.out_into_type = 6)
+        )
+
+        <if test="param.startDate != null">
+            AND de.record_date >= #{param.startDate}
+        </if>
+        <if test="param.endDate != null">
+            AND de.record_date &lt;= #{param.endDate}
+        </if>
+
+        <if test="param.materialName != null and param.materialName != ''">
+            AND (mm.material_name LIKE CONCAT('%', #{param.materialName}, '%')
+            OR mm.material_code LIKE CONCAT('%', #{param.materialName}, '%'))
+        </if>
+
+        <if test="param.areaIdList != null and param.areaIdList.size() > 0">
+            AND dw.area_id IN
+            <foreach collection="param.areaIdList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="param.warehouseIdList != null and param.warehouseIdList.size() > 0">
+            AND dw.warehouse_id IN
+            <foreach collection="param.warehouseIdList" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="warehouseAuthority != null and warehouseAuthority.size() > 0">
+            AND dw.warehouse_id IN
+            <foreach collection="warehouseAuthority" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="areaAuth != null and areaAuth.size() > 0">
+            AND dw.area_id IN
+            <foreach collection="areaAuth" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        ) AS combined
+
+    </select>
+
+</mapper>
+
diff --git a/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml b/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml
new file mode 100644
index 00000000..02857fcb
--- /dev/null
+++ b/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml
@@ -0,0 +1,1176 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.bonus.canteen.core.reportforms.mapper.OrgConsumeMapper">
+
+    <select id="selectConsumeRecords" resultType="java.util.Map">
+
+        SELECT
+        t.area_name AS areaName,
+        CASE
+        WHEN t.flow_type = 120 THEN 'deduction'
+        WHEN t.source_type = 7 THEN 'H5'
+        WHEN t.source_type = 53 THEN 'super'
+        WHEN t.device_name LIKE '%茶歇%' THEN 'teabreak'
+        WHEN (t.source_type IS NULL OR t.source_type = 0 OR t.source_type = '')
+        AND t.remark LIKE '%支付%' THEN 'station'
+        ELSE 'canteen'
+        END AS conSource,
+        ROUND(SUM(t.amount) / 100, 2) AS amount
+        FROM (
+        -- ========= 正常消费 =========
+        SELECT
+        aac.area_name,
+        f.flow_type,
+        f.source_type,
+        f.remark,
+        di.device_name,
+        f.flow_real_amount AS amount,
+        f.flow_id
+        FROM report_account_flow f
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        WHERE
+        f.pay_time <![CDATA[ >= ]]> #{startPayTime}
+        AND f.pay_time <![CDATA[ < ]]> #{endPayTime}
+        AND f.flow_type = 110
+        AND f.status = 1
+        UNION ALL
+
+        -- ========= 退款记录 =========
+        SELECT
+        aac.area_name,
+        130 AS flow_type,
+        f.source_type,
+        f.remark,
+        di.device_name,
+        AT.actual_amount AS amount,
+        f.flow_id AS origin_flow_id
+        FROM acc_trade AT
+        INNER JOIN report_account_flow f
+        ON AT.origin_trade_id = f.flow_id
+        AND f.flow_type = 110
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        WHERE
+        AT.trade_time <![CDATA[ >= ]]> #{startPayTime}
+        AND AT.trade_time <![CDATA[ < ]]> #{endPayTime}
+        AND AT.trade_type = 130
+        AND AT.trade_state = 2
+        AND (AT.machine_sn IS NULL OR AT.machine_sn = '')
+          AND f.status = 1
+        UNION ALL
+
+        SELECT
+        aac.area_name,
+        f.flow_type,
+        f.source_type,
+        f.remark,
+        di.device_name,
+        f.flow_real_amount AS amount,
+        f.flow_id
+        FROM report_account_flow f
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        WHERE
+            f.pay_time <![CDATA[ >= ]]> #{startPayTime}
+          AND f.pay_time <![CDATA[ < ]]> #{endPayTime}
+        AND f.flow_type = 120
+          AND f.status = 1
+             ) t
+        GROUP BY
+        t.area_name,
+        CASE
+        WHEN t.flow_type = 120 THEN 'deduction'
+        WHEN t.source_type = 7 THEN 'H5'
+        WHEN t.source_type = 53 THEN 'super'
+        WHEN t.device_name LIKE '%茶歇%' THEN 'teabreak'
+        WHEN (t.source_type IS NULL OR t.source_type = 0 OR t.source_type = '')
+        AND t.remark LIKE '%支付%' THEN 'station'
+        ELSE 'canteen'
+        END
+        ORDER BY
+        t.area_name;
+
+
+    </select>
+    <select id="selectReserveRecords" resultType="java.util.Map">
+
+        WITH org_hierarchy AS (
+        SELECT
+        co.org_id,
+        co.org_name
+        FROM cust_org co
+        WHERE
+        (co.org_level = 2 AND co.if_del = 2 AND co.org_id != 456365640698040320)
+        OR (co.super_id = 456365640698040320 AND co.if_del = 2)
+        ),
+        normal_transactions AS (
+        SELECT
+        f.org_id,
+        f.flow_real_amount AS amount
+        FROM report_account_flow f
+        WHERE f.pay_time &gt;= #{startPayTime}
+        AND f.pay_time &lt;= #{endPayTime}
+        AND f.flow_type = 110
+        AND f.source_type = 7
+        ),
+        refund_transactions AS (
+        SELECT
+        f.org_id,
+        at.actual_amount AS amount
+        FROM acc_trade at
+        INNER JOIN report_account_flow f
+        ON at.origin_trade_id = f.flow_id
+        AND f.flow_type = 110
+        AND f.source_type = 7
+        WHERE at.trade_time &gt;= #{startPayTime}
+        AND at.trade_time &lt;= #{endPayTime}
+        AND at.trade_type = 130
+        AND at.trade_state = 2
+        AND (at.machine_sn IS NULL OR at.machine_sn = '')
+        ),
+        combined_transactions AS (
+        SELECT org_id, amount FROM normal_transactions
+        UNION ALL
+        SELECT org_id, amount FROM refund_transactions
+        )
+        SELECT
+        oh.org_name AS orgName,
+        ROUND(COALESCE(SUM(ct.amount), 0) / 100, 2) AS reserveAmount
+        FROM org_hierarchy oh
+        LEFT JOIN cust_org c
+        ON c.if_del = 2
+        AND (c.org_id = oh.org_id OR c.org_full_id LIKE CONCAT('%/', oh.org_id, '/%'))
+        LEFT JOIN combined_transactions ct
+        ON c.org_id = ct.org_id
+        WHERE 1=1
+        <if test="orgName != null and orgName != ''">
+            AND oh.org_name LIKE CONCAT('%', #{orgName}, '%')
+        </if>
+        GROUP BY oh.org_id, oh.org_name
+        HAVING COALESCE(SUM(ct.amount), 0) != 0
+        ORDER BY oh.org_id
+    </select>
+    <select id="selectAreaOrgMap" resultType="java.util.Map">
+        SELECT area_name, org_name FROM area_org_map
+    </select>
+    <select id="getlistByArealist" resultType="com.bonus.canteen.core.reportforms.beans.OrgConsume">
+        SELECT
+        co.org_full_name AS orgFullName,
+        t.remark,
+        u.cust_name,
+        u.cust_name_like,
+        t.canteen_name,
+        t.area_name,
+        t.consume_source,
+        t.flow_id,
+        t.flow_type,
+        CASE
+        WHEN t.flow_type = 110 THEN '消费'
+        WHEN t.flow_type = 130 THEN '退款'
+        ELSE '其他'
+        END AS flow_type_name,
+        t.flow_real_amount / 100 AS amount,
+        t.ord_time,
+        t.pay_time,
+        CASE
+        WHEN LENGTH(t.wallets) - LENGTH(REPLACE(t.wallets, ',', '')) > 0 THEN 3
+        ELSE t.wallets
+        END AS walletId
+        FROM (
+        -- ========= 消费逻辑 =========
+        SELECT
+        aa.canteen_name,
+        aac.area_name,
+        CASE
+        WHEN f.source_type = 7 THEN 'H5'
+        WHEN f.source_type = 53 THEN 'super'
+        WHEN di.device_name LIKE '%茶歇%' THEN 'teabreak'
+        WHEN (f.source_type IS NULL OR f.source_type = 0 OR f.source_type = '')
+        AND f.remark LIKE '%支付%' THEN 'station'
+        ELSE 'canteen'
+        END AS consume_source,
+        f.flow_id,
+        f.flow_type,
+        f.flow_real_amount,
+        f.ord_time,
+        f.pay_time,
+        f.cust_id,
+        f.remark,
+        GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets
+        FROM report_account_flow f
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        LEFT JOIN acc_trade_wallet_detail atwd ON atwd.trade_id = f.flow_id
+        WHERE f.pay_time >= #{startPayTime}
+        AND f.pay_time &lt;#{endPayTime}
+        AND f.flow_type = 110
+        AND f.status = 1
+        AND f.source_type NOT IN (7, 53)  -- 排除H5和super
+        AND (di.device_name NOT LIKE '%茶歇%' OR di.device_name IS NULL)  -- 排除茶歇
+        AND NOT ((f.source_type IS NULL OR f.source_type = 0 OR f.source_type = '')
+        AND f.remark LIKE '%支付%')  -- 排除station
+        GROUP BY f.flow_id
+
+        UNION ALL
+
+        -- ========= 退款逻辑 =========
+        SELECT
+        aa.canteen_name,
+        aac.area_name,
+        CASE
+        WHEN f.source_type = 7 THEN 'H5'
+        WHEN f.source_type = 53 THEN 'super'
+        WHEN di.device_name LIKE '%茶歇%' THEN 'teabreak'
+        WHEN (f.source_type IS NULL OR f.source_type = 0 OR f.source_type = '')
+        AND f.remark LIKE '%支付%' THEN 'station'
+        ELSE 'canteen'
+        END AS consume_source,
+        f.flow_id,
+        130 AS flow_type,
+        AT.actual_amount AS flow_real_amount,
+        f.ord_time,
+        AT.trade_time AS pay_time,
+        AT.cust_id,
+        f.remark,
+        GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets
+        FROM acc_trade AT
+        INNER JOIN report_account_flow f ON AT.origin_trade_id = f.flow_id
+        AND f.flow_type = 110
+        AND f.status = 1
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        LEFT JOIN acc_trade_wallet_detail atwd ON atwd.trade_id = f.flow_id
+        WHERE AT.trade_time >= #{startPayTime}
+        AND AT.trade_time &lt;#{endPayTime}
+        AND AT.trade_type = 130
+        AND AT.trade_state = 2
+        AND (AT.machine_sn IS NULL OR AT.machine_sn = '')
+        AND f.source_type NOT IN (7, 53)  -- 排除H5和super
+        AND (di.device_name NOT LIKE '%茶歇%' OR di.device_name IS NULL)  -- 排除茶歇
+        AND NOT ((f.source_type IS NULL OR f.source_type = 0 OR f.source_type = '')
+        AND f.remark LIKE '%支付%')  -- 排除station
+        GROUP BY f.flow_id
+        ) t
+        LEFT JOIN cust_info u ON t.cust_id = u.cust_id
+        LEFT JOIN cust_org co ON u.org_id = co.org_id
+        WHERE t.area_name LIKE CONCAT('%', #{orgName}, '%')
+        AND t.consume_source = 'canteen'
+        ORDER BY t.pay_time DESC
+
+    </select>
+    <select id="getlistBySuperlist" resultType="com.bonus.canteen.core.reportforms.beans.OrgConsume">
+        SELECT
+        co.org_full_name AS orgFullName,
+        t.remark,
+        u.cust_name,
+        u.cust_name_like,
+        t.canteen_name,
+        t.area_name,
+        t.consume_source,
+        t.flow_id,
+        t.flow_type,
+        CASE
+        WHEN t.flow_type = 110 THEN '消费'
+        WHEN t.flow_type = 130 THEN '退款'
+        ELSE '其他'
+        END AS flow_type_name,
+        t.flow_real_amount / 100 AS amount,
+        t.ord_time,
+        t.pay_time,
+        CASE
+        WHEN LENGTH(t.wallets) - LENGTH(REPLACE(t.wallets, ',', '')) > 0 THEN 3
+        ELSE t.wallets
+        END AS walletId
+        FROM (
+        SELECT
+        aa.canteen_name,
+        aac.area_name,
+        CASE
+        WHEN f.source_type = 7 THEN 'H5'
+        WHEN f.source_type = 53 THEN 'super'
+        WHEN di.device_name LIKE '%茶歇%' THEN 'teabreak'
+        WHEN (f.source_type IS NULL OR f.source_type = 0 OR f.source_type = '')
+        AND f.remark LIKE '%支付%' THEN 'station'
+        ELSE 'canteen'
+        END AS consume_source,
+        f.flow_id,
+        f.flow_type,
+        f.flow_real_amount,
+        f.ord_time,
+        f.pay_time,
+        f.cust_id,
+        f.remark,
+        GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets
+        FROM report_account_flow f
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        LEFT JOIN acc_trade_wallet_detail atwd ON atwd.trade_id = f.flow_id
+        WHERE f.pay_time >= #{startPayTime}
+        AND f.pay_time &lt; #{endPayTime}
+        AND f.flow_type = 110
+        AND f.status = 1
+        AND f.source_type = 53  -- 只查询super类型的
+        GROUP BY f.flow_id
+        UNION ALL
+        SELECT
+        aa.canteen_name,
+        aac.area_name,
+        CASE
+        WHEN f.source_type = 7 THEN 'H5'
+        WHEN f.source_type = 53 THEN 'super'
+        WHEN di.device_name LIKE '%茶歇%' THEN 'teabreak'
+        WHEN (f.source_type IS NULL OR f.source_type = 0 OR f.source_type = '')
+        AND f.remark LIKE '%支付%' THEN 'station'
+        ELSE 'canteen'
+        END AS consume_source,
+        f.flow_id,
+        130 AS flow_type,
+        AT.actual_amount AS flow_real_amount,
+        f.ord_time,
+        AT.trade_time AS pay_time,
+        AT.cust_id,
+        f.remark,
+        GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets
+        FROM acc_trade AT
+        INNER JOIN report_account_flow f ON AT.origin_trade_id = f.flow_id
+        AND f.flow_type = 110
+        AND f.status = 1
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        LEFT JOIN acc_trade_wallet_detail atwd ON atwd.trade_id = f.flow_id
+        WHERE AT.trade_time >= #{startPayTime}
+        AND AT.trade_time &lt; #{endPayTime}
+        AND AT.trade_type = 130
+        AND AT.trade_state = 2
+        AND (AT.machine_sn IS NULL OR AT.machine_sn = '')
+        AND f.source_type = 53  -- 只查询super类型的
+        GROUP BY f.flow_id
+        ) t
+        LEFT JOIN cust_info u ON t.cust_id = u.cust_id
+        LEFT JOIN cust_org co ON u.org_id = co.org_id
+        WHERE t.area_name LIKE CONCAT('%', #{orgName}, '%')
+        ORDER BY t.pay_time DESC
+
+    </select>
+    <!--目前这个sql展示的是食堂sql-->
+    <select id="getlistByH5list" resultType="com.bonus.canteen.core.reportforms.beans.OrgConsume">
+        SELECT
+        co2.org_full_name AS orgFullName,
+        co2.org_name AS orgName,
+        u.cust_name,
+        u.cust_name_like,
+        t.flow_id,
+        t.flow_type,
+        CASE
+        WHEN t.flow_type = 110 THEN '消费'
+        WHEN t.flow_type = 130 THEN '退款'
+        ELSE '其他'
+        END AS flow_type_name,
+        t.amount / 100 AS amount, -- 消费/退款金额
+        t.org_id,
+        t.pay_time,
+        t.ord_time,
+        t.walletId
+        FROM cust_org co2
+        LEFT JOIN (
+        <!-- 消费 -->
+        SELECT
+        f.flow_id,
+        f.flow_real_amount AS amount,
+        f.flow_type,
+        f.org_id,
+        f.pay_time,
+        f.ord_time,
+        f.cust_id,
+        atwd.wallet_id AS walletId
+        FROM report_account_flow f
+        LEFT JOIN acc_trade_wallet_detail atwd
+        ON atwd.trade_id = f.flow_id
+        WHERE f.pay_time >= #{startPayTime}
+        AND f.pay_time &lt; #{endPayTime}
+        AND f.flow_type = 110
+        AND f.source_type = 7
+
+        UNION ALL
+
+        <!-- 退款 -->
+        SELECT
+        f.flow_id,
+        AT.actual_amount AS amount,
+        130 AS flow_type,
+        f.org_id,
+        AT.trade_time AS pay_time,
+        f.ord_time,
+        AT.cust_id,
+        atwd.wallet_id AS walletId
+        FROM acc_trade AT
+        INNER JOIN report_account_flow f
+        ON AT.origin_trade_id = f.flow_id
+        AND f.flow_type = 110
+        AND f.source_type = 7
+        LEFT JOIN acc_trade_wallet_detail atwd
+        ON atwd.trade_id = f.flow_id
+        WHERE AT.trade_time >= #{startPayTime}
+        AND AT.trade_time &lt; #{endPayTime}
+        AND AT.trade_type = 130
+        AND AT.trade_state = 2
+        AND (AT.machine_sn IS NULL OR AT.machine_sn = '')
+        ) t ON t.org_id = co2.org_id
+        OR EXISTS (
+        SELECT 1
+        FROM cust_org c3
+        WHERE c3.org_id = t.org_id
+        AND c3.if_del = 2
+        AND c3.org_full_id LIKE CONCAT('%/', co2.org_id, '/%')
+        )
+        LEFT JOIN cust_info u ON t.cust_id = u.cust_id
+        WHERE co2.org_level = 2
+        AND co2.if_del = 2
+        AND co2.org_name LIKE CONCAT('%', #{orgName}, '%')
+        ORDER BY t.pay_time DESC
+
+
+    </select>
+    <select id="yzSumMoney" resultType="java.math.BigDecimal">
+        SELECT
+        SUM(t.flow_real_amount) / 100 AS total_amount
+        FROM (
+        <!-- station 正常消费 -->
+        SELECT
+        aa.canteen_name,
+        aac.area_name,
+        'station' AS consume_source,
+        f.flow_id,
+        d.flow_type,
+        f.flow_real_amount,
+        f.ord_time,
+        d.pay_time,
+        f.cust_id,
+        f.remark
+        FROM report_account_flow f
+        INNER JOIN report_account_flow_detail d ON f.flow_id = d.flow_id
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        WHERE d.pay_time &gt;= #{startPayTime}
+        AND d.pay_time &lt; #{endPayTime}
+        AND d.flow_type = 110
+        AND (f.source_type IS NULL OR f.source_type = 0)
+        AND f.remark LIKE '%支付%'
+
+        UNION ALL
+
+        <!-- station 退款 -->
+        SELECT
+        aa.canteen_name,
+        aac.area_name,
+        'station' AS consume_source,
+        f.flow_id,
+        130 AS flow_type,
+        at.actual_amount AS flow_real_amount,
+        f.ord_time,
+        at.trade_time AS pay_time,
+        f.cust_id,
+        f.remark
+        FROM report_account_flow f
+        INNER JOIN acc_trade at
+        ON at.cust_id = f.cust_id
+        AND at.trade_type = 130
+        AND DATE(at.trade_time) = DATE(f.pay_time)
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        WHERE at.trade_time &gt;= #{startPayTime}
+        AND at.trade_time &lt; #{endPayTime}
+        AND (f.source_type IS NULL OR f.source_type = 0)
+        AND f.remark LIKE '%支付%'
+        ) t
+        LEFT JOIN cust_info u ON t.cust_id = u.cust_id
+        WHERE t.area_name = #{orgName}
+
+    </select>
+    <select id="getlistByOtherlist" resultType="com.bonus.canteen.core.reportforms.beans.OrgConsume">
+    SELECT
+        co.org_full_name AS orgFullName,
+        u.cust_name,
+        u.cust_name_like,
+        t.canteen_name,
+        t.area_name,
+        'station' AS consume_source,
+        t.flow_id,
+        t.flow_type,
+        CASE
+        WHEN t.flow_type = 110 THEN '消费'
+        WHEN t.flow_type = 130 THEN '退款'
+        ELSE '其他'
+        END AS flow_type_name,
+        ROUND(t.amount / 100, 2) AS amount,
+        t.ord_time,
+        t.pay_time,
+        t.walletId,
+        t.remark
+        FROM (
+        SELECT
+        aa.canteen_name,
+        aac.area_name,
+        f.flow_id,
+        f.flow_type,
+        f.flow_real_amount AS amount,
+        f.ord_time,
+        f.pay_time,
+        f.cust_id,
+        wd.wallet_id AS walletId,
+        f.remark
+        FROM report_account_flow f
+        LEFT JOIN (
+        SELECT d.trade_id, MIN(d.wallet_id) AS wallet_id
+        FROM acc_trade_wallet_detail d
+        WHERE d.trade_id IN (
+        SELECT flow_id
+        FROM report_account_flow
+        WHERE pay_time >= #{startPayTime}
+        AND pay_time  &lt; #{endPayTime}
+        AND flow_type = 110
+        AND status = 1
+        )
+        GROUP BY d.trade_id
+        ) wd ON wd.trade_id = f.flow_id
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        WHERE f.pay_time >= #{startPayTime}
+        AND f.pay_time &lt; #{endPayTime}
+        AND f.flow_type = 110
+        AND f.status = 1
+        AND (f.source_type IS NULL OR f.source_type = 0 OR f.source_type = '')
+        AND f.remark LIKE '%支付%'
+
+        UNION ALL
+
+        /* =============== 退款 =============== */
+        SELECT
+        aa.canteen_name,
+        aac.area_name,
+        f.flow_id,
+        130 AS flow_type,
+        at.actual_amount AS amount,
+        f.ord_time,
+        at.trade_time AS pay_time,
+        at.cust_id,
+        wd.wallet_id AS walletId,
+        CONCAT('退款-', f.remark) AS remark
+        FROM acc_trade at
+        INNER JOIN report_account_flow f
+        ON at.origin_trade_id = f.flow_id
+        AND f.flow_type = 110
+        LEFT JOIN (
+        SELECT d.trade_id, MIN(d.wallet_id) AS wallet_id
+        FROM acc_trade_wallet_detail d
+        WHERE d.trade_id IN (
+        SELECT id
+        FROM acc_trade
+        WHERE trade_time >= #{startPayTime}
+        AND trade_time  &lt; #{endPayTime}
+        AND trade_type = 130
+        AND trade_state = 2
+        )
+        GROUP BY d.trade_id
+        ) wd ON wd.trade_id = at.id
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        WHERE at.trade_time >=  #{startPayTime}
+        AND at.trade_time &lt;#{endPayTime}
+        AND at.trade_type = 130
+        AND at.trade_state = 2
+        AND (at.machine_sn IS NULL OR at.machine_sn = '')
+        AND f.status = 1
+        AND (f.source_type IS NULL OR f.source_type = 0 OR f.source_type = '')
+        AND f.remark LIKE '%支付%'
+        ) t
+        LEFT JOIN cust_info u ON t.cust_id = u.cust_id
+        LEFT JOIN cust_org co ON u.org_id = co.org_id
+        WHERE t.area_name LIKE CONCAT('%', #{orgName}, '%')
+        ORDER BY t.pay_time DESC
+
+    </select>
+    <select id="getlistConsmerlist" resultType="com.bonus.canteen.core.reportforms.beans.OrgConsume">
+        SELECT
+            co.org_full_name as orgFullName,
+            aa.canteen_name,
+            f.flow_id ,
+            d.flow_type,
+            f.flow_real_amount   as amount,
+            f.ord_time,
+            d.pay_time,
+            f.cust_id,
+            f.remark,
+            u.cust_name
+        FROM report_account_flow f
+                 INNER JOIN report_account_flow_detail d ON f.flow_id = d.flow_id
+                 LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+                 LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+                 LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+                 LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+                 LEFT JOIN cust_info u ON f.cust_id = u.cust_id
+                 LEFT JOIN cust_org co ON u.org_id = co.org_id
+        WHERE d.pay_time >= #{startPayTime}
+          AND d.pay_time &lt;  #{endPayTime}
+          AND d.flow_type = 110
+          AND (f.source_type IS NULL OR f.source_type = 0)
+          AND f.remark LIKE '%支付%'
+          AND aac.area_name LIKE #{orgName}
+    </select>
+    <select id="getPeoplelist" resultType="com.bonus.canteen.core.reportforms.beans.CanteenRecord">
+        SELECT
+        rf.flow_id AS flowId,
+        ci.cust_num AS custId,
+        ci.cust_name AS custName,
+        ci.mobile AS phone,
+        co.org_id AS orgId,
+        co.org_name AS orgName,
+        co.org_full_name AS orgFullName,
+        rf.flow_amount AS amount,
+        rf.flow_type AS flowType,
+        rf.pay_time AS payTime,
+        rf.ord_time AS ordTime,
+        (SELECT SUM(rf2.flow_amount)
+        FROM report_account_flow rf2
+        LEFT JOIN cust_info ci2 ON rf2.cust_id = ci2.cust_id
+        LEFT JOIN cust_org co2 ON ci2.org_id = co2.org_id
+        WHERE rf2.flow_type IN (110, 120)
+        <if test="custName != null">
+            AND rf2.cust_id = ci.cust_id
+        </if>
+        <if test="selectedOrg != null and selectedOrg.length > 0">
+            AND co2.org_id IN
+            <foreach collection="selectedOrg" item="orgId" open="(" separator="," close=")">
+                #{orgId}
+            </foreach>
+        </if>
+        AND rf2.pay_time  &gt;= #{startPayTime}
+        AND rf2.pay_time &lt;= #{endPayTime}) AS totalConsume,
+        (SELECT SUM(rf3.flow_amount)
+        FROM report_account_flow rf3
+        LEFT JOIN cust_info ci3 ON rf3.cust_id = ci3.cust_id
+        LEFT JOIN cust_org co3 ON ci3.org_id = co3.org_id
+        WHERE rf3.flow_type = 130
+        <if test="custName != null">
+            AND rf3.cust_id = ci.cust_id
+        </if>
+        <if test="selectedOrg != null and selectedOrg.length > 0">
+            AND co3.org_id IN
+            <foreach collection="selectedOrg" item="orgId" open="(" separator="," close=")">
+                #{orgId}
+            </foreach>
+        </if>
+        AND rf3.pay_time &gt;= #{startPayTime}
+        AND rf3.pay_time &lt;= #{endPayTime}) AS totalRefund,
+        rf.remark AS remark
+        FROM report_account_flow rf
+        LEFT JOIN cust_info ci ON rf.cust_id = ci.cust_id
+        LEFT JOIN cust_org co ON ci.org_id = co.org_id
+        WHERE 1=1 and rf.flow_type IN (110, 120,130)
+        <if test="startPayTime != null and startPayTime != ''">
+            AND rf.pay_time &gt;= #{startPayTime}
+        </if>
+        <if test="endPayTime != null and endPayTime != ''">
+            AND rf.pay_time &lt;= #{endPayTime}
+        </if>
+        <if test="custName != null">
+            AND ci.cust_name = #{custName}
+        </if>
+        <if test="selectedOrg != null and selectedOrg.length > 0">
+            AND co.org_id IN
+            <foreach collection="selectedOrg" item="orgId" open="(" separator="," close=")">
+                #{orgId}
+            </foreach>
+        </if>
+
+        ORDER BY rf.pay_time DESC
+    </select>
+    <select id="selectAllOrgs" resultType="com.bonus.canteen.core.reportforms.beans.CanteenOrg">
+        SELECT
+            org_id AS orgId,
+            org_name AS orgName,
+            org_full_name AS orgFullName,
+            super_id AS superId
+        FROM cust_org
+        WHERE if_del = 2
+        ORDER BY org_id ASC
+    </select>
+    <select id="getDeductionlist" resultType="com.bonus.canteen.core.reportforms.beans.OrgConsume">
+        SELECT
+        co.org_full_name  as orgFullName,
+        u.cust_name,
+        f.flow_real_amount / 100 AS amount,
+        aa.canteen_name,
+        aac.area_name,
+        f.source_type,
+        f.remark,
+        f.flow_id,
+        atwd.wallet_id as walletId,
+        f.flow_type,
+        f.pay_time as payTime
+        FROM report_account_flow f
+        left join acc_trade_wallet_detail atwd on atwd.trade_id = f.flow_id
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        LEFT JOIN cust_info u ON f.cust_id = u.cust_id
+        LEFT JOIN cust_org co ON u.org_id = co.org_id
+        WHERE 1=1
+        <if test="startPayTime != null and startPayTime != ''">
+            AND f.pay_time &gt;= #{startPayTime}
+        </if>
+        <if test="endPayTime != null and endPayTime != ''">
+            AND f.pay_time &lt; #{endPayTime}
+        </if>
+        AND f.flow_type = 120
+        and aac.area_name LIKE CONCAT('%', #{orgName}, '%')
+    </select>
+    <select id="selectReserveRecordsFromDatabase" resultType="java.util.Map">
+        SELECT
+            '宏源工业园食堂' AS orgName,
+            ROUND( COALESCE ( SUM( f.flow_real_amount ), 0 ) / 100, 2 ) AS reserveAmount
+        FROM
+            report_account_flow f
+        WHERE
+            f.pay_time >= #{startPayTime} AND f.pay_time &lt;#{endPayTime}
+
+          AND f.flow_type IN ( 110, 130 )
+          AND f.source_type = 7
+          AND f.org_id IN (
+            SELECT
+                org_id
+            FROM
+                cust_org
+            WHERE
+                org_full_name LIKE '%宏源工业园%'
+              AND if_del = 2
+        )
+    </select>
+    <select id="getlistForH5Special" resultType="com.bonus.canteen.core.reportforms.beans.OrgConsume">
+        SELECT
+            co2.org_full_name AS orgFullName,
+            co2.org_name AS orgName,
+            u.cust_name,
+            u.cust_name_like,
+            t.flow_id,
+            t.flow_type,
+            CASE
+                WHEN t.flow_type = 110 THEN '消费'
+                WHEN t.flow_type = 130 THEN '退款'
+                ELSE '其他'
+                END AS flow_type_name,
+            t.amount / 100 AS amount,
+            t.org_id,
+            t.pay_time,
+            t.ord_time,
+            t.walletId
+        FROM cust_org co2
+                 LEFT JOIN (
+            -- 消费
+            SELECT
+                f.flow_id,
+                f.flow_real_amount AS amount,
+                f.flow_type,
+                f.org_id,
+                f.pay_time,
+                f.ord_time,
+                f.cust_id,
+                atwd.wallet_id AS walletId
+            FROM report_account_flow f
+                     LEFT JOIN (
+                SELECT trade_id, MIN(wallet_id) AS wallet_id
+                FROM acc_trade_wallet_detail
+                GROUP BY trade_id
+            ) atwd ON atwd.trade_id = f.flow_id
+            WHERE f.pay_time &gt;= #{startPayTime}
+              AND f.pay_time &lt; #{endPayTime}
+              AND f.flow_type = 110
+              AND f.source_type = 7
+
+            UNION ALL
+
+            -- 退款
+            SELECT
+                f.flow_id,
+                at.actual_amount AS amount,
+                130 AS flow_type,
+                f.org_id,
+                at.trade_time AS pay_time,
+                f.ord_time,
+                at.cust_id,
+                atwd.wallet_id AS walletId
+            FROM acc_trade at
+        INNER JOIN report_account_flow f
+            ON at.origin_trade_id = f.flow_id
+                AND f.flow_type = 110
+                AND f.source_type = 7
+                LEFT JOIN (
+                SELECT trade_id, MIN(wallet_id) AS wallet_id
+                FROM acc_trade_wallet_detail
+                GROUP BY trade_id
+                ) atwd ON atwd.trade_id = f.flow_id
+            WHERE at.trade_time &gt;= #{startPayTime}
+              AND at.trade_time &lt; #{endPayTime}
+              AND at.trade_type = 130
+              AND at.trade_state = 2
+              AND (at.machine_sn IS NULL OR at.machine_sn = '')
+        ) t ON t.org_id = co2.org_id
+            OR EXISTS (
+                SELECT 1
+                FROM cust_org c3
+                WHERE c3.org_id = t.org_id
+                  AND c3.if_del = 2
+                  AND c3.org_full_id LIKE CONCAT('%/', co2.org_id, '/%')
+            )
+                 LEFT JOIN cust_info u ON t.cust_id = u.cust_id
+        WHERE co2.org_level = 2
+          AND co2.if_del = 2
+          AND co2.org_name LIKE CONCAT('%', #{orgName}, '%')
+        ORDER BY t.pay_time DESC
+    </select>
+    <select id="selectOrderMismatchList"
+            resultType="com.bonus.canteen.core.reportforms.beans.ReportOrderInfoVo">
+        SELECT
+        ANY_VALUE(cust_num) AS cust_num,
+        ANY_VALUE(cust_name) AS cust_name,
+        ANY_VALUE(mobile) AS mobile,
+        ANY_VALUE(org_name) AS org_name,
+        ANY_VALUE(org_full_name) AS org_full_name,
+        COUNT(1) AS tradeNum,
+        order_type,
+        SUM(real_amount) AS payable_amount,
+        SUM(real_amount) AS real_amount,
+        area_name,
+        work_area_name
+        FROM (
+        SELECT
+        a.order_id,
+        a.cust_id,
+        ci.cust_num,
+        ci.cust_name,
+        ci.mobile,
+        CASE WHEN ac.canteen_type = '1' THEN '食堂' ELSE '超市' END AS order_type,
+        co.org_name,
+        co.org_full_name,
+        a.payable_amount,
+        a.real_amount,
+        a.pay_time,
+        ac.area_id,
+        ar.area_name,
+        p.dining_place_id,
+        ap.area_name AS work_area_name,
+        a.mch_sn
+        FROM (
+        SELECT
+        a.flow_id AS order_id,
+        a.cust_id,
+        a.flow_amount AS payable_amount,
+        a.flow_real_amount AS real_amount,
+        a.pay_time,
+        CASE
+        WHEN bd.area_id IS NOT NULL THEN bd.area_id
+        WHEN ac.area_id IS NOT NULL THEN ac.area_id
+        WHEN cdp.dining_place_id IS NOT NULL THEN cdp.dining_place_id
+        ELSE a.canteen_id
+        END AS area_id,
+        CONCAT(a.cust_id, a.ord_time) AS id,
+        CASE
+        WHEN bd.canteen_id IS NOT NULL THEN bd.canteen_id
+        WHEN roi.canteen_id IS NOT NULL THEN roi.canteen_id
+        ELSE a.canteen_id
+        END AS canteen_id,
+        a.mch_sn AS mch_sn
+        FROM (
+        SELECT *
+        FROM report_account_flow a
+        WHERE a.pay_time >= #{vo.startTime}
+        AND a.flow_type IN (110, 120)
+        AND a.pay_time  &lt;= #{vo.endTime}
+        ) a
+        LEFT JOIN device_info di ON a.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN (
+        SELECT *
+        FROM report_order_info a
+        WHERE a.pay_time >= #{vo.startTime}
+        AND a.pay_time  &lt;= #{vo.endTime}
+        ) roi ON CONCAT(a.cust_id, a.ord_time) = CONCAT(roi.cust_id, roi.order_time)
+        LEFT JOIN alloc_canteen ac ON ac.canteen_id = roi.canteen_id
+        LEFT JOIN cust_dining_place cdp ON a.cust_id = cdp.cust_id AND cdp.type = 'area'
+
+        UNION
+        SELECT
+        rf.flow_id AS order_id,
+        rf.cust_id,
+        rf.flow_amount AS payable_amount,
+        rf.flow_real_amount AS real_amount,
+        rf.pay_time,
+        CASE
+        WHEN bd.area_id IS NOT NULL THEN bd.area_id
+        WHEN ac.area_id IS NOT NULL THEN ac.area_id
+        WHEN cdp.dining_place_id IS NOT NULL THEN cdp.dining_place_id
+        ELSE COALESCE(ori.canteen_id, rf.canteen_id)
+        END AS area_id,
+        CONCAT(rf.cust_id, rf.ord_time) AS id,
+        CASE
+        WHEN bd.canteen_id IS NOT NULL THEN bd.canteen_id
+        WHEN roi.canteen_id IS NOT NULL THEN roi.canteen_id
+        ELSE COALESCE(ori.canteen_id, rf.canteen_id)
+        END AS canteen_id,
+        COALESCE(ori.mch_sn, rf.mch_sn) AS mch_sn
+        FROM (
+        SELECT *
+        FROM report_account_flow a
+        WHERE a.flow_type = 130
+        AND a.pay_time >= #{vo.startTime}
+        AND a.pay_time  &lt;= #{vo.endTime}
+        ) rf
+        LEFT JOIN acc_trade atr ON rf.flow_id = atr.id
+        LEFT JOIN report_account_flow ori ON atr.origin_trade_id = ori.flow_id
+        LEFT JOIN device_info di ON COALESCE(ori.mch_sn, rf.mch_sn) = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN (
+        SELECT *
+        FROM report_order_info a
+        WHERE a.pay_time >= #{vo.startTime}
+        AND a.pay_time  &lt;= #{vo.endTime}
+        ) roi ON (
+        (ori.cust_id IS NOT NULL AND CONCAT(ori.cust_id, ori.ord_time) = CONCAT(roi.cust_id, roi.order_time))
+        OR (ori.cust_id IS NULL AND CONCAT(rf.cust_id, rf.ord_time) = CONCAT(roi.cust_id, roi.order_time))
+        )
+        LEFT JOIN alloc_canteen ac ON ac.canteen_id = roi.canteen_id
+        LEFT JOIN cust_dining_place cdp ON rf.cust_id = cdp.cust_id AND cdp.type = 'area'
+        WHERE rf.flow_id IS NOT NULL
+        ) a
+        LEFT JOIN alloc_canteen ac ON ac.canteen_id = a.canteen_id
+        LEFT JOIN cust_info ci ON ci.cust_id = a.cust_id
+        LEFT JOIN cust_org co ON co.org_id = ci.org_id
+        JOIN cust_dining_place p ON p.cust_id = ci.cust_id AND p.type = 'area'
+        LEFT JOIN alloc_area ar ON ar.area_id = a.area_id
+        LEFT JOIN alloc_area ap ON ap.area_id = p.dining_place_id
+        WHERE 1=1
+        <if test="vo.commonOrg != 1">
+            AND ar.area_id != p.dining_place_id
+        </if>
+        <!-- 判断消费地 -->
+        <if test="vo.selectedOrg != null and vo.selectedOrg.length > 0">
+            AND ar.area_id IN
+            <foreach collection="vo.selectedOrg" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <!-- 判断工作地 -->
+        <if test="vo.gzselectedOrg != null and vo.gzselectedOrg.length > 0">
+            AND p.dining_place_id IN
+            <foreach collection="vo.gzselectedOrg" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        ) a
+        GROUP BY cust_id, area_name, work_area_name, order_type
+        ORDER BY MAX(a.pay_time) DESC
+
+    </select>
+
+    <select id="selectOrderMismatchListTotal"
+            resultType="com.bonus.canteen.core.reportforms.beans.ReportOrderInfoVo">
+
+        SELECT
+        SUM(tradeNum) AS tradeNum,
+        SUM(real_amount) AS payableAmount,
+        SUM(real_amount) AS realAmount
+        FROM (
+        SELECT
+        COUNT(1) AS tradeNum,
+        SUM(a.payable_amount) AS payable_amount,
+        SUM(a.real_amount) AS real_amount
+        FROM (
+        SELECT
+        a.order_id,
+        a.cust_id,
+        a.payable_amount,
+        a.real_amount,
+        a.pay_time,
+        a.canteen_id,
+        a.mch_sn
+        FROM (
+        select a.flow_id as order_id, a.cust_id,a.flow_amount as  payable_amount,a.flow_real_amount as real_amount,a.pay_time,
+        case when bd.area_id is not null then bd.area_id when ac.area_id is not null then ac.area_id
+        when cdp.dining_place_id is not null then cdp.dining_place_id
+        else a.canteen_id end as area_id,CONCAT(a.cust_id,a.ord_time) as id
+        ,case when bd.canteen_id is not null then bd.canteen_id when roi.canteen_id is not null then roi.canteen_id
+        else a.canteen_id end as canteen_id
+        ,a.mch_sn as mch_sn
+        from (select * from report_account_flow a where a.pay_time >= #{startTime} AND a.flow_type IN ( 110, 120 )
+        AND a.pay_time &lt;= #{endTime} ) a
+        LEFT JOIN device_info di ON a.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN (select * from report_order_info a where a.pay_time >= #{startTime}
+        AND a.pay_time &lt;= #{endTime} ) roi on CONCAT(a.cust_id,a.ord_time)=CONCAT(roi.cust_id,roi.order_time)
+        LEFT JOIN alloc_canteen ac ON ac.canteen_id = roi.canteen_id
+        left join cust_dining_place cdp on a.cust_id=cdp.cust_id and cdp.type = 'area'
+        union
+        select a.flow_id as order_id, a.cust_id,a.flow_amount as  payable_amount,a.flow_real_amount as real_amount,a.pay_time,
+        case when bd.area_id is not null then bd.area_id when ac.area_id is not null then ac.area_id
+        when cdp.dining_place_id is not null then cdp.dining_place_id
+        else a.canteen_id end as area_id,CONCAT(a.cust_id,a.ord_time) as id
+        ,case when bd.canteen_id is not null then bd.canteen_id when roi.canteen_id is not null then roi.canteen_id
+        else a.canteen_id end as canteen_id
+        ,a.mch_sn as mch_sn
+        from (select * from report_account_flow a where a.pay_time >= #{startTime} AND a.flow_type IN ( 130 )
+        AND a.pay_time &lt;= #{endTime} ) a
+        left join acc_trade atr on a.flow_id=atr.id
+        left join (select * from report_account_flow a where a.pay_time >= #{startTime} AND a.flow_type IN ( 110, 120 )
+        AND a.pay_time &lt;= #{endTime} ) aa on atr.origin_trade_id=aa.flow_id
+        LEFT JOIN device_info di ON aa.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN (select * from report_order_info a where a.pay_time >= #{startTime}
+        AND a.pay_time &lt;= #{endTime} ) roi on CONCAT(aa.cust_id,a.ord_time)=CONCAT(roi.cust_id,roi.order_time)
+        LEFT JOIN alloc_canteen ac ON ac.canteen_id = roi.canteen_id
+        left join cust_dining_place cdp on aa.cust_id=cdp.cust_id and cdp.type = 'area'
+        ) a
+        LEFT JOIN alloc_canteen ac ON ac.canteen_id = a.canteen_id
+        LEFT JOIN cust_info ci ON ci.cust_id = a.cust_id
+        LEFT JOIN alloc_area ar ON ar.area_id = a.area_id
+        JOIN cust_dining_place p ON p.cust_id = ci.cust_id AND p.type = 'area'
+        where 1=1
+        <if test="commonOrg != 1">
+            and ar.area_id != p.dining_place_id
+        </if>
+        <!-- 判断消费地 -->
+        <if test="selectedOrg != null and selectedOrg.length  > 0">
+            AND ar.area_id IN
+            <foreach collection="selectedOrg" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+
+        <!-- 判断工作地 -->
+        <if test="gzselectedOrg != null and gzselectedOrg.length  > 0">
+            AND p.dining_place_id IN
+            <foreach collection="gzselectedOrg" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        ) a
+        ) t
+    </select>
+    <select id="selectAllareaOrgs" resultType="com.bonus.canteen.core.reportforms.beans.CanteenOrg">
+        SELECT
+            area_id AS orgId,
+            area_name AS orgName,
+            first_area_name AS orgFullName,
+            super_id AS superId
+        FROM alloc_area
+        WHERE if_del = 2
+        ORDER BY area_id ASC;
+    </select>
+    <select id="exportselectOrderMismatchListTotal"
+            resultType="com.bonus.canteen.core.reportforms.beans.ReportOrderInfoVo">
+
+    </select>
+    <select id="getTeabreaklist" resultType="com.bonus.canteen.core.reportforms.beans.OrgConsume">
+        SELECT
+        co.org_full_name AS orgFullName,
+        u.cust_name,
+        u.cust_name_like,
+        t.canteen_name,
+        t.area_name,
+        'teabreak' AS consume_source,
+        t.flow_id,
+        t.flow_type,
+        CASE
+        WHEN t.flow_type = 110 THEN '消费'
+        WHEN t.flow_type = 130 THEN '退款'
+        ELSE '其他'
+        END AS flow_type_name,
+        t.flow_real_amount / 100 AS amount,
+        t.ord_time,
+        t.pay_time,
+        t.walletId,
+        t.remark
+        FROM (
+        -- ========= 茶歇消费记录 =========
+        SELECT
+        aa.canteen_name,
+        aac.area_name,
+        f.flow_id,
+        d.flow_type,
+        f.flow_real_amount,
+        f.ord_time,
+        d.pay_time,
+        f.cust_id,
+        atwd.wallet_id AS walletId,
+        f.remark
+        FROM report_account_flow f
+        LEFT JOIN acc_trade_wallet_detail atwd ON atwd.trade_id = f.flow_id
+        INNER JOIN report_account_flow_detail d ON f.flow_id = d.flow_id
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        WHERE d.pay_time >= #{startPayTime}
+        AND d.pay_time &lt;#{endPayTime}
+        AND d.flow_type = 110
+        AND di.device_name LIKE '%茶歇%'   -- ✅ 茶歇设备过滤
+
+        UNION ALL
+
+        -- ========= 茶歇退款记录 =========
+        SELECT
+        aa.canteen_name,
+        aac.area_name,
+        f.flow_id,
+        130 AS flow_type,
+        at.actual_amount AS flow_real_amount,
+        f.ord_time,
+        at.trade_time AS pay_time,
+        f.cust_id,
+        atwd.wallet_id AS walletId,
+        f.remark
+        FROM report_account_flow f
+        INNER JOIN acc_trade at
+        ON at.cust_id = f.cust_id
+        AND at.trade_type = 130
+        AND DATE(at.trade_time) = DATE(f.pay_time)
+        AND at.actual_amount = -f.flow_real_amount
+        LEFT JOIN acc_trade_wallet_detail atwd ON atwd.trade_id = f.flow_id
+        LEFT JOIN device_info di ON f.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+        LEFT JOIN alloc_area aac ON aac.area_id = aa.area_id
+        WHERE at.trade_time >= #{startPayTime}
+        AND at.trade_time &lt; #{endPayTime}
+        AND di.device_name LIKE '%茶歇%'
+        ) t
+        LEFT JOIN cust_info u ON t.cust_id = u.cust_id
+        LEFT JOIN cust_org co ON u.org_id = co.org_id
+        WHERE t.area_name LIKE CONCAT('%', #{orgName}, '%')
+        ORDER BY t.pay_time DESC;
+
+    </select>
+</mapper>
diff --git a/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/placeMapper.xml b/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/placeMapper.xml
new file mode 100644
index 00000000..1c3e823c
--- /dev/null
+++ b/bonus-modules/bonus-supply-chain/src/main/resources/mapper/reportforms/placeMapper.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.bonus.canteen.core.reportforms.mapper.PlaceMapper">
+
+    <select id="placeexportExcel" resultType="com.bonus.canteen.core.reportforms.beans.ReportOrderInfoVo">
+        SELECT
+        a.order_id,
+        a.cust_id,
+        ci.cust_num,
+        ci.cust_name,
+        ci.mobile,
+        CASE WHEN ac.canteen_type = '1' THEN '食堂' ELSE '超市' END AS order_type,
+        co.org_name,
+        co.org_full_name,
+        a.payable_amount,
+        a.real_amount,
+        a.pay_time,
+        ac.area_id,
+        ar.area_name,
+        p.dining_place_id,
+        ap.area_name AS work_area_name,
+        a.mch_sn
+        FROM (
+        SELECT
+        a.flow_id AS order_id,
+        a.cust_id,
+        a.flow_amount AS payable_amount,
+        a.flow_real_amount AS real_amount,
+        a.pay_time,
+        CASE
+        WHEN bd.area_id IS NOT NULL THEN bd.area_id
+        WHEN ac.area_id IS NOT NULL THEN ac.area_id
+        WHEN cdp.dining_place_id IS NOT NULL THEN cdp.dining_place_id
+        ELSE a.canteen_id
+        END AS area_id,
+        CONCAT(a.cust_id, a.ord_time) AS id,
+        CASE
+        WHEN bd.canteen_id IS NOT NULL THEN bd.canteen_id
+        WHEN roi.canteen_id IS NOT NULL THEN roi.canteen_id
+        ELSE a.canteen_id
+        END AS canteen_id,
+        a.mch_sn AS mch_sn
+        FROM (
+        SELECT *
+        FROM report_account_flow a
+        WHERE a.pay_time >= #{startTime}
+        AND a.flow_type IN (110, 120)
+        AND a.pay_time &lt;= #{endTime}
+        ) a
+        LEFT JOIN device_info di ON a.mch_sn = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN (
+        SELECT *
+        FROM report_order_info a
+        WHERE a.pay_time >= #{startTime}
+        AND a.pay_time &lt;= #{endTime}
+        ) roi ON CONCAT(a.cust_id, a.ord_time) = CONCAT(roi.cust_id, roi.order_time)
+        LEFT JOIN alloc_canteen ac ON ac.canteen_id = roi.canteen_id
+        LEFT JOIN cust_dining_place cdp ON a.cust_id = cdp.cust_id AND cdp.type = 'area'
+
+        UNION
+
+        SELECT
+        rf.flow_id AS order_id,
+        rf.cust_id,
+        rf.flow_amount AS payable_amount,
+        rf.flow_real_amount AS real_amount,
+        rf.pay_time,
+        CASE
+        WHEN bd.area_id IS NOT NULL THEN bd.area_id
+        WHEN ac.area_id IS NOT NULL THEN ac.area_id
+        WHEN cdp.dining_place_id IS NOT NULL THEN cdp.dining_place_id
+        ELSE COALESCE(ori.canteen_id, rf.canteen_id)
+        END AS area_id,
+        CONCAT(rf.cust_id, rf.ord_time) AS id,
+        CASE
+        WHEN bd.canteen_id IS NOT NULL THEN bd.canteen_id
+        WHEN roi.canteen_id IS NOT NULL THEN roi.canteen_id
+        ELSE COALESCE(ori.canteen_id, rf.canteen_id)
+        END AS canteen_id,
+        COALESCE(ori.mch_sn, rf.mch_sn) AS mch_sn
+        FROM (
+        SELECT *
+        FROM report_account_flow a
+        WHERE a.flow_type = 130
+        AND a.pay_time >= #{startTime}
+        AND a.pay_time &lt;= #{endTime}
+        ) rf
+        LEFT JOIN acc_trade atr ON rf.flow_id = atr.id
+        LEFT JOIN report_account_flow ori ON atr.origin_trade_id = ori.flow_id
+        LEFT JOIN device_info di ON COALESCE(ori.mch_sn, rf.mch_sn) = di.device_sn
+        LEFT JOIN device_bind bd ON di.device_id = bd.device_id
+        LEFT JOIN (
+        SELECT *
+        FROM report_order_info a
+        WHERE a.pay_time >= #{startTime}
+        AND a.pay_time &lt;= #{endTime}
+        ) roi ON (
+        (ori.cust_id IS NOT NULL AND CONCAT(ori.cust_id, ori.ord_time) = CONCAT(roi.cust_id, roi.order_time))
+        OR (ori.cust_id IS NULL AND CONCAT(rf.cust_id, rf.ord_time) = CONCAT(roi.cust_id, roi.order_time))
+        )
+        LEFT JOIN alloc_canteen ac ON ac.canteen_id = roi.canteen_id
+        LEFT JOIN cust_dining_place cdp ON rf.cust_id = cdp.cust_id AND cdp.type = 'area'
+        WHERE rf.flow_id IS NOT NULL
+        ) a
+        LEFT JOIN alloc_canteen ac ON ac.canteen_id = a.canteen_id
+        LEFT JOIN cust_info ci ON ci.cust_id = a.cust_id
+        LEFT JOIN cust_org co ON co.org_id = ci.org_id
+        JOIN cust_dining_place p ON p.cust_id = ci.cust_id AND p.type = 'area'
+        LEFT JOIN alloc_area ar ON ar.area_id = a.area_id
+        LEFT JOIN alloc_area ap ON ap.area_id = p.dining_place_id
+        WHERE 1=1
+        <if test="commonOrg != 1">
+            AND ar.area_id != p.dining_place_id
+        </if>
+        <!-- 判断消费地 -->
+        <if test="selectedOrg != null and selectedOrg.length > 0">
+            AND ar.area_id IN
+            <foreach collection="selectedOrg" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <!-- 判断工作地 -->
+        <if test="gzselectedOrg != null and gzselectedOrg.length > 0">
+            AND p.dining_place_id IN
+            <foreach collection="gzselectedOrg" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY a.pay_time DESC
+        <if test="pageNum != null and pageSize != null">
+            LIMIT #{offset}, #{pageSize}
+        </if>
+
+    </select>
+</mapper>