update: 修改bug SHQBD-1163

application/models/marketing/mysql/Marketing.php

@@ -133,4 +133,18 @@ class Marketing extends MysqlBase
 
         return $data;
     }
+
+    /**
+     * 判断活动是否在进行中
+     * @param $marketingId
+     * @return bool
+     */
+    public static function isGoing($marketingId)
+    {
+        if (empty($marketingId)) {
+            return false;
+        }
+        $marketing = self::getRecord(["marketing_id" => $marketingId]);
+        return !empty($marketing) && $marketing["online_status"] == self::ONLINE_STATUS_QIDONG;
+    }
 }

application/services/marketing/PindanActivityColonelConfigService.php

@@ -74,6 +74,7 @@ class PindanActivityColonelConfigService
         if (!empty($config)) {
             $configData = json_decode($config["data"], true);
             foreach ($configData as $key => $item) {
+                $data[$key]["marketing_id"] = $config["marketing_id"];
                 $data[$key]["date"] = $config["date"];
                 $data[$key]["level"] = $item["level"];
                 $data[$key]["assess_order_num"] = $item["assess_order_num"];
@@ -101,6 +102,12 @@ class PindanActivityColonelConfigService
             $date = date("Y-m-d");
         }
 
+        $configList = self::colonelConfig(["date" => $date, "type" => ColonelDistributorConfig::TYPE_COLONEL]);
+        $marketingId = empty($configList[0]["marketing_id"]) ? 0 : $configList[0]["marketing_id"];
+        if (!Marketing::isGoing($marketingId)) {
+            return ["number" => 0, 'list' => []];
+        }
+
         $num = 0;
         if (!empty($params["user_id"])) {
             $inviteOrderNumRes = ColonelDistributorInviteOrderNum::getRecord([
@@ -110,7 +117,6 @@ class PindanActivityColonelConfigService
             $num = empty($inviteOrderNumRes["num"]) ? 0 : $inviteOrderNumRes["num"];
         }
 
-        $configList = self::colonelConfig(["date" => $date, "type" => ColonelDistributorConfig::TYPE_COLONEL]);
         if (!empty($configList)) {
             foreach ($configList as $key => $config) {
                 $configList[$key]["is_finish"] = 0;