Wesmiler OTC 提交更新 0729

app/Http/Controllers/Admin/ChatController.php

@@ -59,7 +59,13 @@ class ChatController extends Backend
     {
         $pageSize = request()->post('limit', 30);
         $params = request()->all();
-        $list = $this->service->getNewList($params, $pageSize);
+        $type = isset($params['type'])? $params['type'] : 2;
+        if($type == 2){
+            $list = $this->service->getDataList($params, $pageSize);
+        }else{
+            $list = $this->service->getNewList($params, $pageSize);
+        }
+
         $message = array(
             "msg" => '操作成功',
             "code" => 0,

app/Services/Common/AdvertOrderService.php

@@ -323,7 +323,7 @@ class AdvertOrderService extends BaseService
             'type' => 3,
             'order_no' => $orderNo,
             'chat_key' => getChatKey($userId, $businessInfo['id']),
-            'message' => "来自用户{$username}的购买订单，金额{$total}，单号{$orderNo}，时间" . date('Y-m-d H:i:s'),
+            'message' => "您有来自客户购买广告订单：{$orderNo}的消息，请尽快回复！",
             'message_type' => 1,
             'create_time' => time(),
             'update_time' => time(),
@@ -525,7 +525,7 @@ class AdvertOrderService extends BaseService
             'type' => 3,
             'order_no' => $orderNo,
             'chat_key' => getChatKey($userId, $businessInfo['id']),
-            'message' => "来自用户{$username}的出售订单，金额{$total}，单号{$orderNo}，时间" . date('Y-m-d H:i:s'),
+            'message' => "您有来自客户出售广告订单：{$orderNo}的消息，请尽快回复！",
             'message_type' => 1,
             'create_time' => time(),
             'update_time' => time(),