康年堂套餐包统计

fs-service/src/main/java/com/fs/his/mapper/FsStoreOrderMapper.java

@@ -432,8 +432,8 @@ public interface FsStoreOrderMapper
 
 
     @Select({"<script> " +
-            "select u.nick_name, count(o.order_id) as order_count,sum(IFNULL(o.pay_price,0)) as pay_price  from  fs_package_order o left join company_user u on o.company_user_id=u.user_id  " +
-            "where o.status &gt; 1 " +
+            "select u.nick_name, count(o.id) as order_count,sum(IFNULL(o.pay_price,0)) as pay_price  from  fs_store_order_scrm o left join company_user u on o.company_user_id=u.user_id  " +
+            "where o.status &gt; 1 and o.is_package = 1" +
             "<if test = 'maps.type != null and maps.type ==1 '> " +
             "and TO_DAYS(o.create_time) = TO_DAYS(NOW()) " +
             "</if>" +

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -464,14 +464,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY t.type
     </select>
     <select id="selectFsPackageOrderCounts" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT  count(t.order_id ) AS orderCount,  t.type, sum(IFNULL(t.pay_price,0)) as payPrice
+        SELECT  count(t.id ) AS orderCount,  t.type, sum(IFNULL(t.pay_price,0)) as payPrice
         FROM
         (
-        SELECT DATE_FORMAT( o.create_time, #{sqlDateFormat} ) AS type,  o.order_id,o.pay_price
+        SELECT DATE_FORMAT( o.create_time, #{sqlDateFormat} ) AS type,  o.id,o.pay_price
         FROM
-        fs_package_order  AS o
+        fs_store_order_scrm  AS o
         WHERE
-        o.status  &gt; 1 and
+        o.status  &gt; 1 and o.is_package = 1 and
         (DATE_FORMAT(o.create_time,#{sqlDateFormat}) between #{beginTime} and #{finalTime})
         <if test="userIds != null and userIds.length>0">
             AND o.company_user_id IN