Wesmiler OTC 提交更新 0729

app/Services/ChatMessageService.php

@@ -175,7 +175,7 @@ class ChatMessageService extends BaseService
                 }
 
             })
-            ->select(['a.id', 'a.from_uid','a.to_uid','a.type','a.chat_key','a.order_no','a.create_time', 'm.username as from_username','m.avatar as from_avatar','m1.username as to_username','m1.avatar as to_avatar'])
+            ->select(['a.id', 'a.from_uid','a.to_uid','a.type','a.message_type','a.data_type','a.message','a.chat_key','a.order_no','a.create_time', 'm.username as from_username','m.avatar as from_avatar','m1.username as to_username','m1.avatar as to_avatar'])
             ->groupBy('a.chat_key')
             ->orderBy('a.create_time','desc')
             ->paginate($pageSize > 0 ? $pageSize : 9999999);
@@ -238,8 +238,7 @@ class ChatMessageService extends BaseService
                 }
 
             })
-            ->select(['a.id', 'a.from_uid','a.to_uid','a.type','a.chat_key','a.order_no','a.create_time', 'm.username as from_username','m.avatar as from_avatar','m1.username as to_username','m1.avatar as to_avatar'])
-            ->groupBy('a.chat_key')
+            ->select(['a.id', 'a.from_uid','a.to_uid','a.type','a.message_type','a.data_type','a.message','a.chat_key','a.order_no','a.create_time', 'm.username as from_username','m.avatar as from_avatar','m1.username as to_username','m1.avatar as to_avatar'])
             ->orderBy('a.create_time','desc')
             ->paginate($pageSize > 0 ? $pageSize : 9999999);
         $list = $list? $list->toArray() :[];

app/Services/Common/AdvertOrderService.php

@@ -325,6 +325,7 @@ class AdvertOrderService extends BaseService
             'chat_key' => getChatKey($userId, $businessInfo['id']),
             'message' => "您有来自客户购买广告订单：{$orderNo}的消息，请尽快回复！",
             'message_type' => 1,
+            'data_type' => 2,
             'create_time' => time(),
             'update_time' => time(),
             'status' => 1,
@@ -527,6 +528,7 @@ class AdvertOrderService extends BaseService
             'chat_key' => getChatKey($userId, $businessInfo['id']),
             'message' => "您有来自客户出售广告订单：{$orderNo}的消息，请尽快回复！",
             'message_type' => 1,
+            'data_type' => 3,
             'create_time' => time(),
             'update_time' => time(),
             'status' => 1,

app/Services/Common/TradeOrderService.php

@@ -550,6 +550,7 @@ class TradeOrderService extends BaseService
             'chat_key' => getChatKey($userId, $businessInfo['id']),
             'message' => "您有来自客户买单订单：{$orderNo}的消息，请尽快回复！",
             'message_type' => 1,
+            'data_type' => 2,
             'create_time' => time(),
             'update_time' => time(),
             'status' => 1,
@@ -726,6 +727,7 @@ class TradeOrderService extends BaseService
             'chat_key' => getChatKey($userId, $businessInfo['id']),
             'message' => "您有来自客户卖单订单：{$orderNo}的消息，请尽快回复！",
             'message_type' => 1,
+            'data_type' => 3,
             'create_time' => time(),
             'update_time' => time(),
             'status' => 1,