优化云订单新建订单接口

@@ -125,31 +125,14 @@ class OrderDao
  return $data['count'];
  return $data['count'];
  }
  }
 
 
- public function insertIsBackGroup($order_id){
- $data['group_name'] = '黑名单';
- $data['order_uunum'] = $order_id;
- $data['create_time'] = time();
- Yii::$app->db->createCommand()->insert('nt_chat_group', $data)->execute();
- }
-
- public function insertSendOneGroup($order_id){
- $data['group_name'] = '回复数1';
- $data['order_uunum'] = $order_id;
- $data['create_time'] = time();
- Yii::$app->db->createCommand()->insert('nt_chat_group', $data)->execute();
- }
-
- public function insertSendTwoGroup($order_id){
- $data['group_name'] = '回复数2';
- $data['order_uunum'] = $order_id;
- $data['create_time'] = time();
- Yii::$app->db->createCommand()->insert('nt_chat_group', $data)->execute();
- }
-
- public function insertSendThreeGroup($order_id){
- $data['group_name'] = '回复数3';
- $data['order_uunum'] = $order_id;
- $data['create_time'] = time();
- Yii::$app->db->createCommand()->insert('nt_chat_group', $data)->execute();
+ // 初始化默认分组
+ public static function insertBasicGroup($order_id) {
+ $currentTime = time();
+ Yii::$app->db->createCommand()->batchInsert('nt_chat_group', ['group_name', 'order_uunum', 'create_time'], [
+ ['黑名单', $order_id, $currentTime],
+ ['回复数1', $order_id, $currentTime],
+ ['回复数2', $order_id, $currentTime],
+ ['回复数3', $order_id, $currentTime]
+ ])->execute();
  }
  }
 }
 }

@@ -2,11 +2,11 @@
 
 
 namespace app\jobs;
 namespace app\jobs;
 
 
-use app\common\Helper;
 use app\models\StaffModel;
 use app\models\StaffModel;
 use Yii;
 use Yii;
 use app\models\OrderModel;
 use app\models\OrderModel;
 use yii\log\Logger;
 use yii\log\Logger;
+use app\dao\OrderDao;
 
 
 /**
 /**
  * Class queue.
  * Class queue.
@@ -32,10 +32,21 @@ class Order extends \yii\base\BaseObject implements \yii\queue\JobInterface
  */
  */
  public function execute($queue)
  public function execute($queue)
  {
  {
- echo '[' . date('Y-m-d H:i:s') . ']:' . "Start release staff...\r\n";
+ echo '[' . date('Y-m-d H:i:s') . ']:' . "Start release staff... type:". $this->type ."\r\n";
  $this->initialize();
  $this->initialize();
- if($this->type == 1) $this->staffRelease();
- if($this->type == 2) $this->chatEndFan();
+ switch ($this->type) {
+ case 1:
+ $this->staffRelease();
+ break;
+ case 2:
+ $this->chatEndFan();
+ break;
+ case 3:
+ $this->initializeBasicGroup();
+ break;
+ default:
+ break;
+ }
  echo '[' . date('Y-m-d H:i:s') . ']:' . "end release staff...\r\n";
  echo '[' . date('Y-m-d H:i:s') . ']:' . "end release staff...\r\n";
  }
  }
 
 
@@ -106,6 +117,12 @@ class Order extends \yii\base\BaseObject implements \yii\queue\JobInterface
  }
  }
  }
  }
 
 
+ // 初始化订单基础分组
+ public function initializeBasicGroup() {
+ // 初始化默认分组
+ OrderDao::insertBasicGroup($this->order_id);
+ }
+
  /**********DAO**********/
  /**********DAO**********/
 
 
  public function editStaffData($where,$data){
  public function editStaffData($where,$data){

@@ -671,9 +671,7 @@ class OrderLogic
 
 
  public function addFacebookOrder($input){
  public function addFacebookOrder($input){
  // $this->facebookValidator($input);//参数过滤器
  // $this->facebookValidator($input);//参数过滤器
-
  $uuid = $input['uuid'];
  $uuid = $input['uuid'];
-
  //获取uuid对应的手机号
  //获取uuid对应的手机号
  $where = ['and', "uuid = '{$uuid}'"];
  $where = ['and', "uuid = '{$uuid}'"];
  $account = $this->OrderDao->getAccountInfo($where);
  $account = $this->OrderDao->getAccountInfo($where);
@@ -707,7 +705,6 @@ class OrderLogic
  $order_data['order_cloud_console_status'] = 20;
  $order_data['order_cloud_console_status'] = 20;
  $order_data['cloud_console_uuid'] = $uuid;
  $order_data['cloud_console_uuid'] = $uuid;
  }
  }
-
  //判断数据选择，0随机1精准数据
  //判断数据选择，0随机1精准数据
  if($input['select_data'] == 1){
  if($input['select_data'] == 1){
  if(empty($input['data_warehouse_id']) || empty($input['data_warehouse_detail'])) Helper::show('缺少data_warehouse_id或data_warehouse_detail','',201);
  if(empty($input['data_warehouse_id']) || empty($input['data_warehouse_detail'])) Helper::show('缺少data_warehouse_id或data_warehouse_detail','',201);
@@ -861,14 +858,11 @@ class OrderLogic
  Yii::$app->order->delay($chat_time)->push(new \app\jobs\Order($task));
  Yii::$app->order->delay($chat_time)->push(new \app\jobs\Order($task));
  }
  }
 
 
- // 新建默认分组黑名单
- $this->OrderDao->insertIsBackGroup($order_id);
- // 新建默认分组 回复数1
- $this->OrderDao->insertSendOneGroup($order_id);
- // 新建默认分组 回复数2
- $this->OrderDao->insertSendTwoGroup($order_id);
- // 新建默认分组 回复数3
- $this->OrderDao->insertSendThreeGroup($order_id);
+ // push队列初始化分组
+ Yii::$app->order->push(new \app\jobs\Order([
+ 'type' => 3,
+ 'order_id' => $order_data['order_id']
+ ]));
 
 
  $res['order_id'] = $order_data['order_id'];
  $res['order_id'] = $order_data['order_id'];
  $res['order_secret'] = $order_data['order_secret'];
  $res['order_secret'] = $order_data['order_secret'];