diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/reportformsServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/reportformsServiceImpl.java
index d8de08bf..b0fd9f74 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/reportformsServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/reportformsServiceImpl.java
@@ -35,11 +35,11 @@ public class reportformsServiceImpl implements reportformsService {
                         .anyMatch(record -> "宏源工业园食堂".equals(record.get("orgName")));
 
         // 如果没有找到食堂，重新查询并赋值
-                if (!containsCanteen) {
+             /*   if (!containsCanteen) {
                     List<Map<String, Object>> newReserveRecords = mapper.selectReserveRecordsFromDatabase(orgConsume);
                     // 插入新的记录到原有的数据列表
                     reserveRecords.addAll(newReserveRecords); // 保证格式一致，直接合并
-                }
+                }*/
                 //针对特殊食堂退款的问题进行处理，专门写一个方法
 
         //查询区域关联的字段信息
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml
index b5045c12..c7cb4524 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml
@@ -88,365 +88,365 @@
         ORDER BY t.area_name
 
     </select>
-   <select id="selectReserveRecords" resultType="java.util.Map">
+    <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'
-       ELSE 'canteen'
-       END AS consume_source,
-       f.flow_id,
-       d.flow_type,
-       f.flow_real_amount,
-       f.ord_time,
-       d.pay_time,
-       f.cust_id,
-       f.remark,
-       GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets
-       FROM report_account_flow f
-       INNER JOIN report_account_flow_detail d ON f.flow_id = d.flow_id
-       INNER JOIN device_info di ON f.mch_sn = di.device_sn
-       INNER JOIN device_bind bd ON di.device_id = bd.device_id
-       INNER JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
-       INNER 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 d.pay_time >= #{startPayTime}
-       AND d.pay_time &lt; #{endPayTime}
-       AND d.flow_type = 110
-       AND f.source_type IS NOT NULL
-       AND f.source_type NOT IN (7,53)
-       GROUP BY f.flow_id
+        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'
+                         ELSE 'canteen'
+                         END AS consume_source,
+                     f.flow_id,
+                     d.flow_type,
+                     f.flow_real_amount,
+                     f.ord_time,
+                     d.pay_time,
+                     f.cust_id,
+                     f.remark,
+                     GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets
+                 FROM report_account_flow f
+                          INNER JOIN report_account_flow_detail d ON f.flow_id = d.flow_id
+                          INNER JOIN device_info di ON f.mch_sn = di.device_sn
+                          INNER JOIN device_bind bd ON di.device_id = bd.device_id
+                          INNER JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+                          INNER 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 d.pay_time >= #{startPayTime}
+                   AND d.pay_time &lt; #{endPayTime}
+                   AND d.flow_type = 110
+                   AND f.source_type IS NOT NULL
+                   AND f.source_type NOT IN (7,53)
+                 GROUP BY f.flow_id
 
-       UNION ALL
+                 UNION ALL
 
-       -- 退款逻辑
-       SELECT
-       aa.canteen_name,
-       aac.area_name,
-       'canteen' AS consume_source,
-       f.flow_id AS 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 report_account_flow f
-       INNER JOIN acc_trade AT
-       ON AT.origin_trade_id = f.flow_id
-       AND f.flow_type = 110
-       AND AT.actual_amount = f.flow_real_amount
-       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_type = 130
-       AND AT.trade_state = 2
-       AND f.source_type IS NOT NULL
-       AND (AT.machine_sn IS NULL OR AT.machine_sn = '')
-       AND AT.trade_time >= #{startPayTime}
-       AND AT.trade_time &lt;#{endPayTime}
-       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
+                     aa.canteen_name,
+                     aac.area_name,
+                     'canteen' AS consume_source,
+                     f.flow_id AS 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 report_account_flow f
+                          INNER JOIN acc_trade AT
+                 ON AT.origin_trade_id = f.flow_id
+                     AND f.flow_type = 110
+                     AND AT.actual_amount = f.flow_real_amount
+                     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_type = 130
+                   AND AT.trade_state = 2
+                   AND f.source_type IS NOT NULL
+                   AND (AT.machine_sn IS NULL OR AT.machine_sn = '')
+                   AND AT.trade_time >= #{startPayTime}
+                   AND AT.trade_time &lt;#{endPayTime}
+                 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>
-   <select id="getlistBySuperlist" resultType="com.bonus.canteen.core.reportforms.beans.OrgConsume">
-       SELECT DISTINCT
-           co.org_full_name AS orgFullName,
-           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,
-           CASE
-               WHEN LENGTH(t.wallets) - LENGTH(REPLACE(t.wallets, ',', '')) > 0 THEN 3
-               ELSE t.wallets
-               END AS walletId,
-           t.pay_time
-       FROM (
-                -- 消费逻辑
-                SELECT
-                    aa.canteen_name,
-                    aac.area_name,
-                    'super' AS consume_source,
-                    f.flow_id,
-                    d.flow_type,
-                    f.flow_real_amount,
-                    f.ord_time,
-                    GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets,
-                    d.pay_time,
-                    f.cust_id
-                FROM report_account_flow f
-                         INNER JOIN report_account_flow_detail d ON f.flow_id = d.flow_id
-                         INNER JOIN device_info di ON f.mch_sn = di.device_sn
-                         INNER JOIN device_bind bd ON di.device_id = bd.device_id
-                         INNER JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
-                         INNER 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 d.pay_time <![CDATA[>=]]> #{startPayTime}
-                  AND d.pay_time <![CDATA[<]]> #{endPayTime}
-                  AND d.flow_type = 110
-                  AND f.source_type = 53
-                GROUP BY f.flow_id
+    </select>
+    <select id="getlistBySuperlist" resultType="com.bonus.canteen.core.reportforms.beans.OrgConsume">
+        SELECT DISTINCT
+            co.org_full_name AS orgFullName,
+            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,
+            CASE
+                WHEN LENGTH(t.wallets) - LENGTH(REPLACE(t.wallets, ',', '')) > 0 THEN 3
+                ELSE t.wallets
+                END AS walletId,
+            t.pay_time
+        FROM (
+                 -- 消费逻辑
+                 SELECT
+                     aa.canteen_name,
+                     aac.area_name,
+                     'super' AS consume_source,
+                     f.flow_id,
+                     d.flow_type,
+                     f.flow_real_amount,
+                     f.ord_time,
+                     GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets,
+                     d.pay_time,
+                     f.cust_id
+                 FROM report_account_flow f
+                          INNER JOIN report_account_flow_detail d ON f.flow_id = d.flow_id
+                          INNER JOIN device_info di ON f.mch_sn = di.device_sn
+                          INNER JOIN device_bind bd ON di.device_id = bd.device_id
+                          INNER JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+                          INNER 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 d.pay_time <![CDATA[>=]]> #{startPayTime}
+                   AND d.pay_time <![CDATA[<]]> #{endPayTime}
+                   AND d.flow_type = 110
+                   AND f.source_type = 53
+                 GROUP BY f.flow_id
 
-                UNION ALL
+                 UNION ALL
 
-                -- 补充消费逻辑
-                SELECT
-                    bo.canteen_name,
-                    bo.area_name,
-                    bo.consume_source,
-                    f.flow_id,
-                    d.flow_type,
-                    f.flow_real_amount,
-                    f.ord_time,
-                    GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets,
-                    d.pay_time,
-                    f.cust_id
-                FROM report_account_flow f
-                         INNER JOIN report_account_flow_detail d ON f.flow_id = d.flow_id
-                         INNER JOIN (
-                    SELECT
-                        aa.canteen_name,
-                        aac.area_name,
-                        'super' AS consume_source,
-                        f.ord_time
-                    FROM report_account_flow f
-                             INNER JOIN report_account_flow_detail d ON f.flow_id = d.flow_id
-                             INNER JOIN device_info di ON f.mch_sn = di.device_sn
-                             INNER JOIN device_bind bd ON di.device_id = bd.device_id
-                             INNER JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
-                             INNER JOIN alloc_area aac ON aac.area_id = aa.area_id
-                    WHERE d.pay_time <![CDATA[>=]]> #{startPayTime}
-                      AND d.pay_time <![CDATA[<]]> #{endPayTime}
-                      AND d.flow_type = 110
-                      AND f.source_type = 53
-                ) bo ON f.ord_time = bo.ord_time
-                         LEFT JOIN acc_trade_wallet_detail atwd ON atwd.trade_id = f.flow_id
-                WHERE d.pay_time <![CDATA[>=]]> #{startPayTime}
-                  AND d.pay_time <![CDATA[<]]> #{endPayTime}
-                  AND d.flow_type = 130
-                  AND (f.mch_sn IS NULL OR f.mch_sn = '')
-                GROUP BY f.flow_id
+                 -- 补充消费逻辑
+                 SELECT
+                     bo.canteen_name,
+                     bo.area_name,
+                     bo.consume_source,
+                     f.flow_id,
+                     d.flow_type,
+                     f.flow_real_amount,
+                     f.ord_time,
+                     GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets,
+                     d.pay_time,
+                     f.cust_id
+                 FROM report_account_flow f
+                          INNER JOIN report_account_flow_detail d ON f.flow_id = d.flow_id
+                          INNER JOIN (
+                     SELECT
+                         aa.canteen_name,
+                         aac.area_name,
+                         'super' AS consume_source,
+                         f.ord_time
+                     FROM report_account_flow f
+                              INNER JOIN report_account_flow_detail d ON f.flow_id = d.flow_id
+                              INNER JOIN device_info di ON f.mch_sn = di.device_sn
+                              INNER JOIN device_bind bd ON di.device_id = bd.device_id
+                              INNER JOIN alloc_canteen aa ON aa.canteen_id = bd.canteen_id
+                              INNER JOIN alloc_area aac ON aac.area_id = aa.area_id
+                     WHERE d.pay_time <![CDATA[>=]]> #{startPayTime}
+                       AND d.pay_time <![CDATA[<]]> #{endPayTime}
+                       AND d.flow_type = 110
+                       AND f.source_type = 53
+                 ) bo ON f.ord_time = bo.ord_time
+                          LEFT JOIN acc_trade_wallet_detail atwd ON atwd.trade_id = f.flow_id
+                 WHERE d.pay_time <![CDATA[>=]]> #{startPayTime}
+                   AND d.pay_time <![CDATA[<]]> #{endPayTime}
+                   AND d.flow_type = 130
+                   AND (f.mch_sn IS NULL OR f.mch_sn = '')
+                 GROUP BY f.flow_id
 
-                UNION ALL
+                 UNION ALL
 
-                -- 退款逻辑（严格金额匹配 + 时间过滤）
-                SELECT
-                    aa.canteen_name,
-                    aac.area_name,
-                    'super' AS consume_source,
-                    f.flow_id,
-                    130 AS flow_type,
-                    AT.actual_amount AS flow_real_amount,
-                    f.ord_time,
-                    GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets,
-                    AT.trade_time AS pay_time,
-                    f.cust_id
-                FROM report_account_flow f
-                         INNER JOIN acc_trade AT
-                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
-                    LEFT JOIN acc_trade_wallet_detail atwd ON atwd.trade_id = f.flow_id
-                WHERE AT.trade_type = 130
-                  AND AT.trade_state = 2
-                  AND f.source_type = 53
-                  AND AT.trade_time <![CDATA[>=]]> #{startPayTime}
-                  AND AT.trade_time <![CDATA[<]]> #{endPayTime}
-                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 = #{orgName}
-       ORDER BY t.pay_time DESC
+                 -- 退款逻辑（严格金额匹配 + 时间过滤）
+                 SELECT
+                     aa.canteen_name,
+                     aac.area_name,
+                     'super' AS consume_source,
+                     f.flow_id,
+                     130 AS flow_type,
+                     AT.actual_amount AS flow_real_amount,
+                     f.ord_time,
+                     GROUP_CONCAT(DISTINCT atwd.wallet_id) AS wallets,
+                     AT.trade_time AS pay_time,
+                     f.cust_id
+                 FROM report_account_flow f
+                          INNER JOIN acc_trade AT
+                 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
+                     LEFT JOIN acc_trade_wallet_detail atwd ON atwd.trade_id = f.flow_id
+                 WHERE AT.trade_type = 130
+                   AND AT.trade_state = 2
+                   AND f.source_type = 53
+                   AND AT.trade_time <![CDATA[>=]]> #{startPayTime}
+                   AND AT.trade_time <![CDATA[<]]> #{endPayTime}
+                 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 = #{orgName}
+        ORDER BY t.pay_time DESC
 
-   </select>
+    </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
+    <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
+        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
+        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>
     <select id="yzSumMoney" resultType="java.math.BigDecimal">
         SELECT
         SUM(t.flow_real_amount) / 100 AS total_amount
@@ -508,8 +508,9 @@
 
     </select>
     <select id="getlistByOtherlist" resultType="com.bonus.canteen.core.reportforms.beans.OrgConsume">
+
         SELECT
-        co.org_full_name as orgFullName,
+        co.org_full_name AS orgFullName,
         u.cust_name,
         u.cust_name_like,
         t.canteen_name,
@@ -528,7 +529,6 @@
         t.walletId,
         t.remark
         FROM (
-        <!-- station 正常消费 -->
         SELECT
         aa.canteen_name,
         aac.area_name,
@@ -539,21 +539,23 @@
         f.ord_time,
         d.pay_time,
         f.cust_id,
-        atwd.wallet_id as walletId,
+        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
+        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}
+        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 f.source_type IS NULL
+        AND f.remark LIKE '%支付%'
+
         UNION ALL
+
         SELECT
         aa.canteen_name,
         aac.area_name,
@@ -564,56 +566,59 @@
         f.ord_time,
         at.trade_time AS pay_time,
         f.cust_id,
-        atwd.wallet_id as walletId,
+        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)
-        left join acc_trade_wallet_detail atwd on atwd.trade_id = f.flow_id
+        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 (f.source_type IS NULL OR f.source_type = 0)
-        AND f.remark LIKE  '%支付%'
+        WHERE f.source_type IS NULL
+        AND f.remark LIKE '%支付%'
+        AND at.trade_time >=  #{startPayTime}
+        AND at.trade_time  &lt; #{endPayTime}
+
         ) 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
+        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
+            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
+                 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}
+          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
@@ -695,17 +700,17 @@
     </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
+        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
@@ -860,48 +865,51 @@
         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.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,
-        CONCAT(a.cust_id,a.ord_time) AS id,
-        a.mch_sn AS mch_sn
-        FROM report_account_flow a
+        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 report_order_info roi
-        ON CONCAT(a.cust_id,a.ord_time)=CONCAT(roi.cust_id,roi.order_time)
-        WHERE a.pay_time >= #{vo.startTime}
-        AND a.flow_type IN (110, 120, 130)
-        AND a.pay_time &lt;= #{vo.endTime}
-        AND (a.remark NOT LIKE '%支付' OR a.remark IS NULL)
-
-        UNION ALL
-
-        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, bd.canteen_id,
-        CONCAT(a.cust_id,a.ord_time) AS id,
-        a.mch_sn AS mch_sn
-        FROM report_account_flow a
-        LEFT JOIN device_info di ON a.mch_sn = di.device_sn
+        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 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 ( 130 )
+        AND a.pay_time &lt;= #{vo.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 >= #{vo.startTime} AND a.flow_type IN ( 110, 120 )
+        AND a.pay_time &lt;= #{vo.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
-        WHERE a.pay_time >= #{vo.startTime}
-        AND a.flow_type IN (110, 120, 130)
-        AND a.pay_time &lt;= #{vo.endTime}
-        AND a.remark LIKE '%支付'
+        LEFT JOIN (select * from report_order_info a where a.pay_time >= #{vo.startTime}
+        AND a.pay_time &lt;= #{vo.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 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 = ac.area_id
+        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 ac.area_id != p.dining_place_id
+        WHERE ar.area_id != p.dining_place_id
         <!-- 判断消费地 -->
         <if test="vo.selectedOrg != null and vo.selectedOrg.length > 0">
-            AND ac.area_id IN
+            AND ar.area_id IN
             <foreach collection="vo.selectedOrg" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
@@ -929,34 +937,48 @@
         p.dining_place_id
         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.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,CONCAT(a.cust_id,a.ord_time) as id
+        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 report_account_flow a
+        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 report_order_info roi on CONCAT(a.cust_id,a.ord_time)=CONCAT(roi.cust_id,roi.order_time)
-        where a.pay_time >= #{startTime} AND a.flow_type IN ( 110, 120,130 )
-        AND a.pay_time &lt;= #{endTime} and (a.remark not like '%支付' or a.remark is null)
-
-        UNION ALL
-
-        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,bd.canteen_id
-        ,CONCAT(a.cust_id,a.ord_time) as 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 report_account_flow a
-        LEFT JOIN device_info di ON a.mch_sn = di.device_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
-        where a.pay_time >= #{startTime} 	AND a.flow_type IN ( 110, 120,130 )
-        AND a.pay_time &lt;= #{endTime} and a.remark like '%支付'
+        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
         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 ac.area_id != p.dining_place_id
+        WHERE ar.area_id != p.dining_place_id
         <!-- 判断消费地 -->
         <if test="selectedOrg != null and selectedOrg.length  > 0">
-            AND ac.area_id IN
+            AND ar.area_id IN
             <foreach collection="selectedOrg" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
@@ -994,34 +1016,48 @@
         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.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,CONCAT(a.cust_id,a.ord_time) as id
+        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 report_account_flow a
+        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 report_order_info roi on CONCAT(a.cust_id,a.ord_time)=CONCAT(roi.cust_id,roi.order_time)
-        where a.pay_time >= #{startTime} AND a.flow_type IN ( 110, 120,130 )
-        AND a.pay_time &lt;= #{endTime} and (a.remark not like '%支付' or a.remark is null)
-
-        UNION ALL
-
-        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,bd.canteen_id
-        ,CONCAT(a.cust_id,a.ord_time) as 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 report_account_flow a
-        LEFT JOIN device_info di ON a.mch_sn = di.device_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
-        where a.pay_time >= #{startTime} 	AND a.flow_type IN ( 110, 120,130 )
-        AND a.pay_time &lt;= #{endTime} and a.remark like '%支付'
+        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 ac.area_id != p.dining_place_id
+        WHERE ar.area_id != p.dining_place_id
         <!-- 判断消费地 -->
         <if test="selectedOrg != null and selectedOrg.length  > 0">
-            AND ac.area_id IN
+            AND ar.area_id IN
             <foreach collection="selectedOrg" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/placeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/placeMapper.xml
index e7e83fdd..d1ea4159 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/placeMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/placeMapper.xml
@@ -34,48 +34,51 @@
         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.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,
-        CONCAT(a.cust_id,a.ord_time) AS id,
-        a.mch_sn AS mch_sn
-        FROM report_account_flow a
+        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 report_order_info roi
-        ON CONCAT(a.cust_id,a.ord_time)=CONCAT(roi.cust_id,roi.order_time)
-        WHERE a.pay_time >= #{startTime}
-        AND a.flow_type IN (110, 120, 130)
-        AND a.pay_time &lt;= #{endTime}
-        AND (a.remark NOT LIKE '%支付' OR a.remark IS NULL)
-
-        UNION ALL
-
-        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, bd.canteen_id,
-        CONCAT(a.cust_id,a.ord_time) AS id,
-        a.mch_sn AS mch_sn
-        FROM report_account_flow a
-        LEFT JOIN device_info di ON a.mch_sn = di.device_sn
+        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
-        WHERE a.pay_time >= #{startTime}
-        AND a.flow_type IN (110, 120, 130)
-        AND a.pay_time &lt;= #{endTime}
-        AND a.remark LIKE '%支付'
+        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 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 = ac.area_id
+        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 ac.area_id != p.dining_place_id
+        WHERE ar.area_id != p.dining_place_id
         <!-- 判断消费地 -->
         <if test="selectedOrg != null and selectedOrg.length > 0">
-            AND ac.area_id IN
+            AND ar.area_id IN
             <foreach collection="selectedOrg" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>