diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopTableOrderStatisticMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopTableOrderStatisticMapper.java
index 5e4affdb..cb9d665c 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopTableOrderStatisticMapper.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopTableOrderStatisticMapper.java
@@ -21,4 +21,6 @@ public interface ShopTableOrderStatisticMapper extends BaseMapper<ShopTableOrder
     boolean incrInfo(long shopId, long tableId, long count, BigDecimal amount, String dateStr);
 
     List<TableSummaryInfoVo> findSummaryList(TableSummaryParam param);
+
+    List<TableSummaryInfoVo> findSummaryList2(TableSummaryParam param);
 }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/TableSummaryServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/TableSummaryServiceImpl.java
index 953ce14b..6a6c8fdd 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/TableSummaryServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/TableSummaryServiceImpl.java
@@ -23,7 +23,7 @@ public class TableSummaryServiceImpl implements TableSummaryService {
 
     @Override
     public List<TableSummaryInfoVo> summaryList(TableSummaryParam param) {
-        return shopTableOrderStatisticMapper.findSummaryList(param);
+        return shopTableOrderStatisticMapper.findSummaryList2(param);
     }
 
 }
diff --git a/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml b/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml
index 0a2153b7..a88d8e16 100644
--- a/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml
@@ -64,11 +64,11 @@
         WHERE  t1.shop_id = #{shopId}
         and t1.paid_time is not null
         <if test="beginDate != null and beginDate != ''">
-            and t1.create_time >= str_to_date(concat(#{beginDate},' 00:00:00'), '%Y-%m-%d %H:%i:%s')
+            and t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d %H:%i:%s')
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[
-            and t1.create_time <= str_to_date(concat(#{endDate},' 23:59:59'), '%Y-%m-%d %H:%i:%s')
+            and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d %H:%i:%s')
             ]]>
         </if>
         group by t1.pay_type
@@ -79,11 +79,11 @@
         from tb_shop_user_flow t1
         where t1.shop_id = #{shopId}
         <if test="beginDate != null and beginDate != ''">
-            and t1.create_time >= str_to_date(concat(#{beginDate},' 00:00:00'), '%Y-%m-%d %H:%i:%s')
+            and t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d %H:%i:%s')
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[
-            and t1.create_time <= str_to_date(concat(#{endDate},' 23:59:59'), '%Y-%m-%d %H:%i:%s')
+            and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d %H:%i:%s')
             ]]>
         </if>
         group by t1.biz_code
@@ -96,11 +96,11 @@
         WHERE t1.shop_id = #{shopId}
         and t1.paid_time is not null
         <if test="beginDate != null and beginDate != ''">
-            and t1.create_time >= str_to_date(concat(#{beginDate},' 00:00:00'), '%Y-%m-%d %H:%i:%s')
+            and t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d %H:%i:%s')
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[
-            and t1.create_time <= str_to_date(concat(#{endDate},' 23:59:59'), '%Y-%m-%d %H:%i:%s')
+            and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d %H:%i:%s')
             ]]>
         </if>
     </select>
@@ -112,11 +112,11 @@
         WHERE t1.shop_id = #{shopId}
         and t1.paid_time is not null
         <if test="beginDate != null and beginDate != ''">
-            and t1.create_time >= str_to_date(concat(#{beginDate},' 00:00:00'), '%Y-%m-%d %H:%i:%s')
+            and t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d %H:%i:%s')
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[
-            and t1.create_time <= str_to_date(concat(#{endDate},' 23:59:59'), '%Y-%m-%d %H:%i:%s')
+            and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d %H:%i:%s')
             ]]>
         </if>
     </select>
diff --git a/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml b/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml
index 160ac40a..756d551b 100644
--- a/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml
@@ -100,11 +100,11 @@
             and t2.category_id like concat('%,', #{prodCategoryId}, ',%')
         </if>
         <if test="beginDate != null and beginDate != ''">
-            and t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d')
+            and t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d %H:%i:%s')
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[
-            and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d')
+            and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d %H:%i:%s')
             ]]>
         </if>
     </select>
@@ -129,11 +129,11 @@
             and t2.category_id  = #{prodCategoryId}
         </if>
         <if test="beginDate != null and beginDate != ''">
-            and t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d')
+            and t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d %H:%i:%s')
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[
-            and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d')
+            and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d %H:%i:%s')
             ]]>
         </if>
         GROUP BY t1.product_id,t1.product_name
@@ -148,11 +148,11 @@
         from tb_order_detail t1
         where t1.shop_id = #{shopId}
         <if test="beginDate != null and beginDate != ''">
-            and t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d')
+            and t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d %H:%i:%s')
         </if>
         <if test="endDate != null and endDate != ''">
             <![CDATA[
-            and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d')
+            and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d %H:%i:%s')
             ]]>
         </if>
         GROUP BY t1.product_id,t1.product_name
diff --git a/cash-service/order-service/src/main/resources/mapper/ShopTableOrderStatisticMapper.xml b/cash-service/order-service/src/main/resources/mapper/ShopTableOrderStatisticMapper.xml
index 96a671d6..533d2c09 100644
--- a/cash-service/order-service/src/main/resources/mapper/ShopTableOrderStatisticMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/ShopTableOrderStatisticMapper.xml
@@ -43,9 +43,34 @@
             AND t1.create_day >= str_to_date(#{beginDate}, '%Y-%m-%d')
         </if>
         <if test="endDate != null and endDate != ''">
-            and t2.create_day &lt;= str_to_date(#{endDate}, '%Y-%m-%d')
+            and t1.create_day &lt;= str_to_date(#{endDate}, '%Y-%m-%d')
         </if>
         group by t1.table_id
         order by sum(t1.order_count) desc,max(t1.id) desc
     </select>
+    <select id="findSummaryList2" resultType="com.czg.order.vo.TableSummaryInfoVo">
+        SELECT
+        t1.table_code,
+        ifnull(t2.NAME,t1.table_code) AS table_name,
+        ifnull(t3.NAME,'未知') AS area_name,
+        count( t1.id ) AS order_count,
+        sum( t1.pay_amount ) as order_amount,
+        ifnull(count( case when t1.refund_amount > 0 then 1 end),0) AS refund_count,
+        ifnull( sum( t1.refund_amount ), 0 ) AS refund_amount
+        FROM
+        tb_order_info t1
+        LEFT JOIN tb_shop_table t2 ON t1.table_code = t2.table_code and t1.shop_id = t2.shop_id
+        LEFT JOIN tb_shop_table_area t3 ON t2.area_id = t3.id
+        where t1.shop_id = #{shopId}
+        and t1.table_code is not null
+        and t2.name is not null
+        <if test="beginDate != null and beginDate != ''">
+            AND t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="endDate != null and endDate != ''">
+            and t1.create_time &lt;= str_to_date(#{endDate}, '%Y-%m-%d %H:%i:%s')
+        </if>
+        GROUP BY t1.table_code
+        order by count( t1.id ) desc,sum( t1.pay_amount ) desc
+    </select>
 </mapper>