Merge branch 'feature/mzl_dev'

app/controller/IndexController.php

@@ -2,14 +2,17 @@
 
 namespace app\controller;
 
+use app\common\model\InquiryLog;
 use app\common\model\User;
 use app\common\model\UserRoles;
 use app\common\model\UserSystems;
+use app\common\utils\email\MailSend;
 use app\common\utils\scaffold\Generate;
 use support\Request;
 use support\Db;
 use support\Cache;
 use app\inquiry\service\InquiryLogService;
+use Illuminate\Support\Facades\Mail;
 
 class IndexController
 {
@@ -77,7 +80,7 @@ class IndexController
             // ],
             'model'         => [
                 'module'    => 'common',
-                'name'      => 'crm_customer'
+                'name'      => 'inquiry_channel'
             ],
             // 'service'       => [
             //     'module'    => 'inquiry',
@@ -91,7 +94,7 @@ class IndexController
             //     'module'    => 'inquiry',
             //     'name'      => 'country'
             // ],
-            'table'         => 'crm_customer'
+            'table'         => 'inquiry_channel'
         ];
 
         $result = (new Generate($options))->doGenerate();
@@ -101,23 +104,10 @@ class IndexController
 
     public function test()
     {
-        // $res = ['id'=>25714];
-        // \Webman\RedisQueue\Redis::send('inquiry-to-crm', $res);
 
-        // $res = [
-        //     'id'=>25717,
-        //     'category'=>'inquiry',
-        //     'scene'=>'inquiry-person-allocation',
-        //     'receive_type'=>'person'
-        // ];
+        $data = MailSend::getContent(22);
+        MailSend::send('mzl@hnxinyouhe.com', '【XYH】新的客户线索', replaceTpl($data));
 
-        // $res = [
-        //     'id'=>1,
-        //     'category'=>'crm',
-        //     'scene'=>'crm-person-follow-up',
-        //     'receive_type'=>'person'
-        // ];
-        // \Webman\RedisQueue\Redis::send('feishu-message', $res);
-        return 'success';
+        return 22;
     }
 }