修改

YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -247,27 +247,51 @@
     </select>
 
     <!--POS机查询近七天数据-->
+<!--    <select id="selectPosRecentlySevenData" parameterType="com.platform.yijia.pojo.PayOrder" resultType="map">-->
+<!--        SELECT-->
+<!--            DATE_FORMAT(T3.days, '%m-%d')	AS time,-->
+<!--            SUM(IFNULL(T2.amt,0))           AS amtSum,-->
+<!--            COUNT(T2.order_no)              AS orderSum-->
+<!--        FROM (-->
+<!--            ( SELECT-->
+<!--                @date := DATE_ADD(@date, INTERVAL + 1 DAY) AS days-->
+<!--              FROM-->
+<!--                ( SELECT @date := DATE_ADD(#{endTime}, INTERVAL - 8 DAY) FROM pay_order LIMIT 7 ) T1-->
+<!--            ) T3 LEFT JOIN pay_order AS T2 ON T3.days = DATE_FORMAT(T2.created_date, '%Y-%m-%d')-->
+<!--                AND T2.station_id= #{stationId}-->
+<!--                AND T2.status= #{status}-->
+<!--                AND T2.created_date &gt;= #{beginTime}-->
+<!--                AND T2.created_date &lt; #{endTime}-->
+<!--        )-->
+<!--        GROUP BY T3.days-->
+<!--    </select>-->
+
+    <!--POS机查询近七天数据-->
     <select id="selectPosRecentlySevenData" parameterType="com.platform.yijia.pojo.PayOrder" resultType="map">
         SELECT
-            DATE_FORMAT(T3.days, '%m-%d')	AS time,
-            SUM(IFNULL(T2.amt,0))           AS amtSum,
-            COUNT(T2.order_no)              AS orderSum
-        FROM (
-            ( SELECT
-                @date := DATE_ADD(@date, INTERVAL + 1 DAY) AS days
-              FROM
-                ( SELECT @date := DATE_ADD(#{endTime}, INTERVAL - 8 DAY) FROM pay_order LIMIT 7 ) T1
-            ) T3 LEFT JOIN pay_order AS T2 ON T3.days = DATE_FORMAT(T2.created_date, '%Y-%m-%d')
-                AND T2.station_id= #{stationId}
-                AND T2.status= #{status}
-                AND T2.created_date &gt;= #{beginTime}
-                AND T2.created_date &lt; #{endTime}
-        )
-        GROUP BY T3.days
+            V.month_days                        AS time,
+            ROUND(SUM(IFNULL(T1.amt,"0")),2)    AS amtSum,
+            COUNT(T1.order_no)                  AS orderSum
+        FROM        view_recently_seven_day	    AS V
+        LEFT JOIN   pay_order                   AS T1 ON V.month_days = DATE_FORMAT(T1.created_date,'%m-%d')
+            <if test="stationId !=null">
+                AND T1.station_id= #{stationId}
+            </if>
+            <if test="status !=null">
+                AND T1.status= #{status}
+            </if>
+            <if test="beginTime !=null">
+                AND T1.created_date &gt;= #{beginTime}
+            </if>
+            <if test="endTime !=null">
+                AND T1.created_date &lt; #{endTime}
+            </if>
+        GROUP BY month_days
     </select>
 
 
 
+
   <!--查询班结时间内订单-->
   <select id="selectPayOrderList" parameterType="com.platform.yijia.pojo.PayOrder" resultMap="BaseResultMap">
     SELECT