Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-17 4e93084b3466fa7fcb8431a67e6552f9bbed831f

 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml

@@ -147,9 +147,7 @@
         IFNULL(sum(IFNULL( b.amount, 0 )),0)
      FROM
         shop_salesman_order b
      WHERE
         b.user_id = a.open_id
        and order_status=2
      WHERE order_status=2
        AND b.sales_user_id = #{openId}

   ) AS totalRevenue,
@@ -158,9 +156,7 @@
         IFNULL(sum(IFNULL( b.amount, 0 )),0)
      FROM
         shop_salesman_order b
      WHERE
         b.user_id = a.open_id
        and order_status=2 and revenue_type=1
      WHERE order_status=2 and revenue_type=1
        AND b.sales_user_id = #{openId}

   ) AS salesRevenue,
@@ -169,9 +165,7 @@
         IFNULL(sum(IFNULL( b.amount, 0 )),0)
      FROM
         shop_salesman_order b
      WHERE
         b.user_id = a.open_id
        and order_status=2 and revenue_type=2
      WHERE order_status=2 and revenue_type=2
        AND b.sales_user_id = #{openId}

   ) AS invitationRevenue,
@@ -181,16 +175,13 @@
         IFNULL(sum(IFNULL( b.amount, 0 )),0)
      FROM
         shop_salesman_order b
      WHERE
         b.user_id = a.open_id
        and order_status=1
      WHERE order_status=1
        AND b.sales_user_id = #{openId}

   ) AS djsRevenue,

   ( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} and revenue_type =1 ) AS salesorderCount,
   ( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} and revenue_type =2 ) AS invitationOrderCount,

   (select count(*) from biz_user where parent_open_id=#{openId} and is_sales=1) as invitationCount,
   (select count(*) from biz_user where parent_open_id=#{openId} and is_sales=2) as customerCount
   from biz_user a where