合并分支 'heshupeng' 到 'master'

留言发送模板消息



查看合并请求 !298

@@ -396,6 +396,7 @@ class HouseBoard extends Api
                     'is_read_user' => 1
                 ];
                 $res_msg = $msg_model->edit($update);
+                $message_id = $msg['id'];
             } else {
                 $insert = $where_m;
                 $insert['type'] = 3;
@@ -403,6 +404,7 @@ class HouseBoard extends Api
                 $insert['image'] = $param['image'];
                 $insert['is_read_user'] = 2;
                 $res_msg = $msg_model->add($insert);
+                $message_id = $msg_model->where($where_m)->value('id');
             }
             // 发送模板消息
             $send_data = array(
@@ -412,7 +414,7 @@ class HouseBoard extends Api
                 "remark" => '',
             );
             $openid = Db::name('third')->where('user_id',$param['house_user_id'])->value('openid');
-            $url = config('option.vue_url') . '/liuyanxiaoxi?is_template=1&id='.$res_msg['id'];
+            $url = config('option.vue_url') . '/liuyanxiaoxi?is_template=1&id='.$message_id;
             $this->wxsendmessage($openid,$send_data,config('option.template')['msg'],$url);
             Db::commit();
         } catch (PDOException $e) {

@@ -697,14 +697,19 @@ class User extends Api
             ];
             $res_msg = $msg_model->edit($update);
             // 发送模板消息
-//            $send_data = array(
-//                "first"  => '',
-//                'keyword1' => '',
-//                "keyword2"   => '',
-//                "keyword3"  => date('Y-m-s',time()),
-//                "remark" => '',
-//            );
-//            $this->wxsendmessage('','','');
+            $send_data = array(
+                "first"  => '您有一条新的消息',
+                'keyword1' => $param['content'] ? $param['content'] : '【图片消息】',
+                "keyword2"  => date('Y-m-s H:i:s',time()),
+                "remark" => '',
+            );
+            $openid = Db::name('third')->where('user_id',$msg['object_user_id'])->value('openid');
+            if($msg['type'] == 2) {
+                $url = config('option.vue_url') . '/messageto?is_template=1&id='.$msg['id'];
+            } elseif($msg['type'] == 3) {
+                $url = config('option.vue_url') . '/liuyanxiaoxi?is_template=1&id='.$msg['id'];
+            }
+            $this->wxsendmessage($openid,$send_data,config('option.template')['msg'],$url);
             Db::commit();
         } catch (PDOException $e) {
             Db::rollback();