升级

application/api/controller/EmailClient.php

@@ -1385,7 +1385,7 @@ class EmailClient extends Base
         $factoryId    = intval($this->request->param('promotion_factory_id', 0));
         $sendDate     = trim($this->request->param('send_date', date('Y-m-d', strtotime('+1 day'))));
         $taskName     = trim($this->request->param('task_name', ''));
-        $noRepeatDays = intval($this->request->param('no_repeat_days', 30));
+        $noRepeatDays = intval($this->request->param('no_repeat_days', 15));
         $minInterval  = intval($this->request->param('min_interval', 30));
         $maxInterval  = intval($this->request->param('max_interval', 60));
         $maxBounceRate  = intval($this->request->param('max_bounce_rate', 5));
@@ -2624,8 +2624,8 @@ class EmailClient extends Base
         $expertType = intval($factory['expert_type']);
         $dailyLimit = max(1, intval($factory['send_count']));
 
-        // 默认频次：expert=30天，内部=60天
-        $noRepeatDaysDefault = $expertType === 5 ? 30 : 60;
+        // 默认频次：expert=15天，内部=20天
+        $noRepeatDaysDefault = $expertType === 5 ? 15 : 20;
         $noRepeatDays = intval($this->request->param('no_repeat_days', $noRepeatDaysDefault));
 
         if ($expertType === 5) {
@@ -2734,7 +2734,7 @@ class EmailClient extends Base
 
         $query = Db::name('expert')->alias('e')
             ->join('t_expert_field ef', 'e.expert_id = ef.expert_id', 'inner')
-            ->where('e.state', 0)
+//            ->where('e.state', 0)
             ->where('e.unsubscribed', 0)
             ->where('ef.state', 0);
 
@@ -2776,11 +2776,16 @@ class EmailClient extends Base
             $query->where('e.country_id', 'in', $countryIds);
         }
 
-        return $query
+        $res1 = $query
             ->field('e.*')
             ->group('e.expert_id')
             ->limit($limit)
             ->select();
+
+
+//        echo $query->getLastSql();
+
+        return $res1;
     }
 
     /**

application/api/controller/Journal.php

@@ -126,6 +126,24 @@ class Journal extends Base {
         return jsonSuccess($program);
     }
 
+    public function citeMate(){
+        $data = $this->request->post();
+        $rule = new Validate([
+            "journal_id"=>"require",
+            "year"=>"require"
+        ]);
+        if(!$rule->check($data)){
+            return jsonError($rule->getError());
+        }
+        $journal_info = $this->journal_obj->where("journal_id",$data['journal_id'])->find();
+        $url = "http://journalapi.tmrjournals.com/public/index.php/api/Main/citeMate";
+        $program['journal_issn'] = $journal_info['issn'];
+        $program['year'] = $data['year'];
+        $res = object_to_array(json_decode(myPost($url,$program)));
+
+        return json($res);
+    }
+
     public function delJournalStage(){
         $data = $this->request->post();
         $rule = new Validate([