Merge branch 'colonel' into develop

application/models/marketing/mysql/TakePlace.php

@@ -3,6 +3,7 @@
 namespace App\Models\marketing\mysql;
 
 use Api\PhpUtils\Mysql\MysqlBase;
+use App\Services\marketing\MarketingService;
 
 /**
  * 自提点
@@ -25,7 +26,7 @@ class TakePlace extends MysqlBase
      */
     public static function searchList($params)
     {
-        $lifeAccountId = $params['life_account_id'] ?? 0;
+        $lifeAccountId = $params['life_account_id'] ?? MarketingService::getPublicLifeAccountId();
         $keywords = $params['keywords'] ?? '';
         $offset = $params['offset'] ?? 0;
         $limit = $params['limit'] ?? 20;

application/services/marketing/PindanActivityColonelConfigService.php

@@ -23,9 +23,11 @@ class PindanActivityColonelConfigService
     {
         $date = $params["date"];
         $today = date("Y-m-d");
-        if ($date <= $today) {
+        $hour = date("H");
+        if ($date < $today || ($date == $today && $hour >= 12)) {
             throw new MarketingException(['cus' => MarketingException::COLONEL_DATE_ERROR]);
         }
+
         $type = empty($params["type"]) ? ColonelDistributorConfig::TYPE_COLONEL : $params["type"];
         $configList = $params["config"];
         $marketingId = $params["marketing_id"];