Merge branch 'colonel' into develop

application/modules/Cli/controllers/Colonelorder.php

@@ -38,13 +38,15 @@ class ColonelorderController extends Cli
     {
         FileLog::info("colonel_distributor_order", '团长分销-计算奖励脚本:start');
         $userIdList = $this->getColonelUserIds();
-        if (!empty($userIdList) && !empty($this->colonelConfigList)) {
+        if (!empty($userIdList)) {
             $userIdList = array_chunk($userIdList, self::DEFAULT_USER_BATCH_SIZE);
             $colonelPayInfoData = [];
             foreach ($userIdList as $userIds) {
                 $batchPayInfoData   = [];
                 // 完成目标单数
-                $batchPayInfoData[] = $this->getInviteOrderData($userIds);
+                if (!empty($this->colonelConfigList)) {
+                    $batchPayInfoData[] = $this->getInviteOrderData($userIds);
+                }
                 // 邀请新用户奖励
                 $batchPayInfoData[] = $this->getInviteNewUserData($userIds);
                 $colonelPayInfoData = array_merge($colonelPayInfoData, $batchPayInfoData);