type

application/api/controller/AppointmentTime.php

@@ -346,7 +346,7 @@ class AppointmentTime extends Basic
         try {
             $m_push = new OPushMessageModel();
             $where['user_id'] = $this->userId;
-//            $where['user_id'] = 135399;
+//            $where['user_id'] = 91;
             $where['status'] = 0;
             $where['type']   = ['in', '0,3'];
 
@@ -354,16 +354,18 @@ class AppointmentTime extends Basic
 
             if (empty($id[0]['id'])) {
                 $data['is_alert'] = 0;
+                $data['string_1'] = '';
+                $data['string_2'] = '';
             } else {
                 $data['name'] = $id[0]['message'];
                 $data['is_alert'] = 1;
                 $type = $id[0]['type'];
-                $str = '同联商业邀请您评价经纪人\n';
+                $data['string_1'] = '同联商业邀请您评价经纪人';
                 switch ($type) {
                     case 0 :
-                        $data['alert_msg'] = $str.$id[0]['message'].'的商铺带看服务';break;
+                        $data['string_2'] = $id[0]['message'].'的商铺带看服务';break;
                     case 3 :
-                        $data['alert_msg'] = $str.$id[0]['message'].'的商铺成交服务';break;
+                        $data['string_2'] = $id[0]['message'].'的商铺成交服务';break;
                 }
             }
 

application/api_broker/service/OrderLogService.php

@@ -82,7 +82,7 @@ class OrderLogService
                 }
 
                 $this->updateBargainIsOpen($bargain_id, $collecting['type'], $is_open);
-                $pay_type = $collecting['pay_type'];
+                $type = $collecting['type'];
             }
         }
         if ($father_id > 0) {
@@ -91,7 +91,7 @@ class OrderLogService
             $oImgModel->addImgAll($father_id, 2, $transfer_img);
 
             $pushMarchIn = new PushMessageService();
-            $pushMarchIn->pushMarchInMessage($params["report_id"], 2, $agent_id, $pay_type); //推送
+            $pushMarchIn->pushMarchInMessage($params["report_id"], 2, $agent_id, $type); //推送
         }
         //todo if bill_arr not null, save database table
         if (!empty($bill_arr)) {
@@ -160,7 +160,6 @@ class OrderLogService
                         $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id));
                 }
                 $this->updateBargainIsOpen($bargain_id, $collecting['type'], $is_open);
-                $pay_type = $collecting['pay_type'];
             }
         }
         if ($father_id > 0) {
@@ -176,7 +175,7 @@ class OrderLogService
             }
 
             $pushMarchIn = new PushMessageService();
-            $pushMarchIn->pushMarchInMessage($params["report_id"], 2, $agent_id, $pay_type); //推送
+            $pushMarchIn->pushMarchInMessage($params["report_id"], 2, $agent_id, $type); //推送
         }
         //todo if bill_arr not null, save database table
         if (!empty($bill_arr)) {