喜报详情修改

application/api_broker/controller/Feed.php

@@ -99,7 +99,7 @@ class Feed extends Basic
         header('Access-Control-Allow-Origin:*');
 
         $push = new PushFeed();
-        $field = 'id,create_time,house_title,click_num,content';
+        $field = 'id,create_time,house_title,click_num,content,type';
 
         if (empty($this->params['id'])) {
             return $this->response(101, "Id is null!");
@@ -108,6 +108,10 @@ class Feed extends Basic
         $where['id'] = $this->params['id'];
         $where['status'] = 0;
         $data = $push->getFeedInfo($field, $where);
+
+        if ($data['type'] == 0) {
+            $data['type_string'] = '成功下定';
+        }
         return $this->response(200, "", $data);
     }
 }
\ No newline at end of file

application/api_broker/service/PushMessageService.php

@@ -103,27 +103,26 @@ class PushMessageService
         $report_data = $report->getReportOrder($field, [ 'a.id' => $report_id ]);
 
         $store = new AStore();
-        $store_name = $store->getStoreKeyById('store_name',$report_data['report_store_id']);
+        $store_name = $store->getStoreDistrictName($report_data['report_store_id']);
         $title   = '成交就是这么简单';
-        $content = "恭喜【{$store_name}】店【{$report_data['report_agent_name']}】成交【{$report_data['house_title']}】商铺一套";
-        $url = $this->push->http_host(). '/app/feed';
 
         $feed->editData([
             'title' => $title,
             'agent_id'  => -1,
             'report_id' => $report_id,
             'house_id'  => $report_data['house_id'],
-            'content' => $content,
+            'content' => $store_name . $report_data['report_agent_name'],
             'steel_phone' => 0,
             'type' => 0,
-            'link' => $url,
             'status' => 0,
             'user_id' => $report_data['report_agent_id'],
             'house_title' => $report_data['house_title'],
             'read_num' => 10,   //不要问什么，就是产品要加的。PV
             'click_num' => 10  //不要问什么，就是产品要加的。
         ]);
-
+        $content = "恭喜【{$store_name}】店【{$report_data['report_agent_name']}】成交【{$report_data['house_title']}】商铺一套";
+        $url = $this->push->http_host(). '/app/dist/index.html#/feeds?id='.$feed->id;
+        $feed->editData(['link'=>$url], $feed->id);
         $this->push->push_message_for_all($title, $content, $url);
 
         return ;