Merge branch 'master' of https://git.nuttyreading.com/zm/tougao
This commit is contained in:
@@ -2405,8 +2405,8 @@ class EmailClient extends Base
|
||||
'bounce_count' => 0,
|
||||
'state' => 0,
|
||||
'smtp_ids' => $smtpIds,
|
||||
'min_interval' => 30,
|
||||
'max_interval' => 60,
|
||||
'min_interval' => max(intval($factory['min_interval']),30),
|
||||
'max_interval' => max(intval($factory['max_interval']),60),
|
||||
'max_bounce_rate' => 5,
|
||||
'no_repeat_days' => $noRepeatDays,
|
||||
'send_start_hour' => 8,
|
||||
|
||||
@@ -128,6 +128,8 @@ class PromotionFactory extends Base
|
||||
'fetch_ids' => trim(isset($data['fetch_ids']) ? (string)$data['fetch_ids'] : ''),
|
||||
'target_partitions' => trim(isset($data['target_partitions']) ? (string)$data['target_partitions'] : ''),
|
||||
'target_country_ids' => trim(isset($data['target_country_ids']) ? (string)$data['target_country_ids'] : ''),
|
||||
'min_interval' => intval(isset($data['min_interval']) ? $data['min_interval'] : 0),
|
||||
'max_interval' => intval(isset($data['max_interval']) ? $data['max_interval'] : 0),
|
||||
'state' => 0,
|
||||
'ctime' => $now,
|
||||
]);
|
||||
@@ -185,9 +187,10 @@ class PromotionFactory extends Base
|
||||
$allowedFields = [
|
||||
'type', 'expert_type', 'email_ids', 'send_count',
|
||||
'template_id', 'style_id', 'fetch_ids',
|
||||
'min_interval', 'max_interval',
|
||||
'target_partitions', 'target_country_ids',
|
||||
];
|
||||
$intFields = ['type', 'expert_type', 'send_count', 'template_id', 'style_id'];
|
||||
$intFields = ['type', 'expert_type', 'send_count', 'template_id', 'style_id', 'min_interval', 'max_interval'];
|
||||
|
||||
foreach ($allowedFields as $f) {
|
||||
if (isset($data[$f])) {
|
||||
|
||||
Reference in New Issue
Block a user