Merge branch 'colonel' into develop

application/models/marketing/mysql/ColonelDistributorPayInfo.php

@@ -8,7 +8,7 @@ class ColonelDistributorPayInfo extends MysqlBase
 {
     const TABLE_NAME = 'colonel_distributor_pay_info';
     const CONFIG_INDEX = 'marketing';
-    const PRIMARY_KEY = 'colonel_distributor_pay_info_id';
+    const PRIMARY_KEY = 'pay_info_id';
 
     const TYPE_NEW_USER = 1;
     const TYPE_FINISH_TARGET = 2;

application/modules/Cli/controllers/Colonelorder.php

@@ -42,14 +42,14 @@ class ColonelorderController extends Cli
             $userIdList = array_chunk($userIdList, self::DEFAULT_USER_BATCH_SIZE);
             $colonelPayInfoData = [];
             foreach ($userIdList as $userIds) {
-                $batchPayInfoData   = [];
                 // 完成目标单数
-                if (!empty($this->colonelConfigList)) {
-                    $batchPayInfoData[] = $this->getInviteOrderData($userIds);
+                if ($inviteOrderData = $this->getInviteOrderData($userIds)) {
+                    $colonelPayInfoData = array_merge($colonelPayInfoData,$inviteOrderData);
                 }
                 // 邀请新用户奖励
-                $batchPayInfoData[] = $this->getInviteNewUserData($userIds);
-                $colonelPayInfoData = array_merge($colonelPayInfoData, $batchPayInfoData);
+                if ($inviteNewUserData = $this->getInviteNewUserData($userIds)) {
+                    $colonelPayInfoData = array_merge($colonelPayInfoData,$inviteNewUserData);
+                }
             }
             $this->handleSavePayInfo($colonelPayInfoData);
         }
@@ -118,8 +118,11 @@ class ColonelorderController extends Cli
     public function getInviteOrderData($userIds)
     {
         //完成目标单数
-        $inviteOrderNumList = $this->getInviteOrderNum($userIds, $this->yesterday, $this->today);
         $inviteOrderData = [];
+        if (empty($this->colonelConfigList)) {
+            return $inviteOrderData;
+        }
+        $inviteOrderNumList = $this->getInviteOrderNum($userIds, $this->yesterday, $this->today);
         foreach ($inviteOrderNumList as $orderNum) {
             foreach ($this->colonelConfigList as $config) {
                 if (!empty($orderNum["num"]) && $orderNum["num"] >= $config["assess_order_num"]) {