Merge branch 'colonel' into develop

application/library/Validate/BaseValidate.php

@@ -49,4 +49,19 @@ class BaseValidate extends Validate
             return false;
         }
     }
+
+    protected function isDate($value)
+    {
+        //匹配日期格式
+        if (preg_match("/^([0-9]{4})-([0-9]{2})-([0-9]{2})$/", $value, $parts)) {
+            //检测是否为日期
+            if (checkdate($parts[2], $parts[3], $parts[1])) {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 }
\ No newline at end of file

application/library/Validate/ColonelConfigValidate.php

@@ -5,12 +5,12 @@ namespace Validate;
 class ColonelConfigValidate extends BaseValidate
 {
     protected $rule = [
-        'date' => 'require',
+        'date' => 'require|isDate',
         'config' => 'require',
     ];
 
     protected $message = [
-        'date' => 'date 参数不能为空',
+        'date' => 'date 参数格式错误',
         'config' => 'config 参数不能为空',
         'marketing_id' => 'marketing_id 参数不能为空',
     ];

application/services/marketing/PindanActivityInviteOrderService.php

@@ -213,7 +213,8 @@ class PindanActivityInviteOrderService
         } else {
             $startTime   = date('Y-m-d', strtotime('-2 day')).$hour;
         }
-        $endTime = date("Y-m-d").$hour;
+        //$endTime = date("Y-m-d").$hour;
+        $endTime = date("Y-m-d H:i:s"); // 结束时间应该取当前时间
 
         return [
             'start_time' => $startTime,