Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel

application/services/marketing/PindanActivityInviteOrderService.php

@@ -142,7 +142,7 @@ class PindanActivityInviteOrderService
         $timeRange = self::getNoSettlementTimeRange();
         $inviteOrderNumList = ColonelDistributorInviteOrderNum::select(["colonel_user_id", "num", "date"], [
             "create_time[>]" => $timeRange["start_time"],
-            "create_time[<]" => $timeRange["end_time"],
+            "colonel_user_id" => $userIds,
             ], []);
         $inviteOrderNumData = [];
         $inviteOrderStatistics = [];
@@ -269,14 +269,18 @@ class PindanActivityInviteOrderService
     }
 
     /**
-     * 团长分销，昨日转化单数，总转化单数
+     * 团长分销，累计转化单数
      * @param array $params
      * @return array
      */
     public static function inviteOrderNumberStatistics($params = [])
     {
+        $timeRange = self::getNoSettlementTimeRange();
+
         $userIds = $params["user_ids"];
-        $allNums = ColonelDistributorInviteOrderNum::select(["colonel_user_id", "num"], ["colonel_user_id" => $userIds], []);
+        $allNums = ColonelDistributorInviteOrderNum::select(
+            ["colonel_user_id", "num"],
+            ["colonel_user_id" => $userIds, "create_time[<]" => $timeRange["start_time"]], []);
         $allData = array_column($allNums, null, "colonel_user_id");
 
         $data = [];