问答独立聊天，多项提交

app/Admin/Forms/User/UserChatReplyForm.php

@@ -40,7 +40,7 @@ class UserChatReplyForm extends Form implements LazyRenderable
         $chat = WxChat::find($id);
         $oid = $chat->user_id;
         $uid = $chat->object_id;
-        $model = WxContRepositories::add($uid, $oid, $content, $img, '', '', 0);
+        $model = WxContRepositories::add($uid, $oid, $content, $img, '', '', 0);//普通聊天
         if($model){
 
             $websocket_id = GatewayUtils::uid2client_id($oid);

app/Http/Controllers/Api/MessagesController.php

@@ -321,12 +321,26 @@ class MessagesController extends BaseController
         if ($uid) {
             $noticeCount = WxNotice::where([['user_id','=', $uid], ['is_read','=', 0]])->count();
 
-            $chatCount = WxChat::where([['object_id','=', $uid],['is_read','=', 0],['chat_state', '=', 0]])->count();
+            $chatCount = WxChat::where([['object_id','=', $uid],['is_read','=', 0],['chat_state', '=', 0]])->where('expand_type','!=',9)->count();
             $circleCount = UserUtils::user_circle_unread_count($uid);
             $count = $noticeCount + $chatCount + $circleCount;
         }
         return $this->success($count);
     }
 
+    /**
+     * 查询用户是否有未读付费咨询信息
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getAskMessageCount(Request $request){
+        $count = 0;
+        $uid = $request->uid;
+        if ($uid) {
+            $count = WxChat::where([['object_id','=', $uid],['is_read','=', 0],['chat_state', '=', 0]])->where('expand_type',9)->count();
+        }
+        return $this->success($count);
+    }
+
 
 }

app/Http/Controllers/Api/PetsController.php

@@ -513,7 +513,7 @@ class PetsController extends BaseController{
             $apply->remark = $remark;
             $r = $apply->save();
             if($r){
-                $model = WxContRepositories::add($uid, $the_adoption->user_id, null, null, null, 0, null, $apply->id);
+                $model = WxContRepositories::add($uid, $the_adoption->user_id, null, null, null, 0, null, $apply->id);//领养申请
                 DB::commit();
                 return $this->success(['id'=>$apply->id, 'object_id'=>$the_adoption->user_id], 200, '发送成功');
             }else{

app/Http/Controllers/Api/Repositories/WxContRepositories.php

@@ -15,7 +15,7 @@ class WxContRepositories
      * 添加
      * @param [$uid,$feedback_type,$feedback_content]
      */
-    public static function add($uid, $oid, $chat_content, $chat_image,$chat_audio_url, $chat_audio_length, $refer_id, $adoption_apply_id = null, $contact_apply_id = null, $shop_good_id = null, $used_good_id = null, $bureau_id = null, $voter_id = null)
+    public static function add($uid, $oid, $chat_content, $chat_image,$chat_audio_url, $chat_audio_length, $refer_id, $adoption_apply_id = null, $contact_apply_id = null, $shop_good_id = null, $used_good_id = null, $bureau_id = null, $voter_id = null, $ask_order_id = null)
     {
         $chatModel = new Model();
 
@@ -64,6 +64,10 @@ class WxContRepositories
             $chatModel->expand_id = $voter_id;
         }
 
+        if(!_empty_($ask_order_id)){
+            $chatModel->expand_type = 9;
+            $chatModel->expand_id = $ask_order_id;
+        }
 
 
         $r = $chatModel->save();
@@ -96,6 +100,9 @@ class WxContRepositories
                     }else if($chatModel->expand_type == 8){
                         $chat_content_ = '选票活动';
                         $chatModel->voter_id = $chatModel->expand_id;
+                    }else if($chatModel->expand_type == 9){
+                        $chat_content_ = '付费咨询';
+                        $chatModel->ask_order_id = $chatModel->expand_id;
                     }else if($chatModel->expand_type == 101){
                         $chat_content_ = '笔记审核推送';
                     }else if($chatModel->expand_type == 102){

app/Http/Controllers/Api/UsedController.php

@@ -336,7 +336,7 @@ class UsedController extends BaseController
                     if($last_chat && $last_chat->expand_type == 5 && $last_chat->expand_id == $user_good->id){
 
                     }else{
-                        WxContRepositories::add($user_good->user_id, $uid, '', '', '', 0, 0, 0, 0, 0, $user_good->id);
+                        WxContRepositories::add($user_good->user_id, $uid, '', '', '', 0, 0, 0, 0, 0, $user_good->id);//闲置商品
                     }
                 }
             }else{
@@ -357,7 +357,7 @@ class UsedController extends BaseController
             if($last_chat && $last_chat->expand_type == 5 && $last_chat->expand_id == $user_good->id){
 
             }else{
-                WxContRepositories::add($user_good->user_id, $uid, '', '', '', 0, 0, 0, 0, 0, $user_good->id);
+                WxContRepositories::add($user_good->user_id, $uid, '', '', '', 0, 0, 0, 0, 0, $user_good->id);//闲置商品
             }
         }
         return $this->success();

app/Http/Controllers/Api/UserController.php

@@ -1693,7 +1693,7 @@ class UserController extends BaseController
             $model->status = 0;
             $r = $model->save();
             if($r){
-                $r2 = WxContRepositories::add($model->user_id, $model->object_id, null, null, null, 0, null, null, $model->id);
+                $r2 = WxContRepositories::add($model->user_id, $model->object_id, null, null, null, 0, null, null, $model->id);//联系信息申请
                 if($r2){
                     DB::commit();
                     return $this->success();

app/Routes/api/v1.php

@@ -464,12 +464,15 @@ Route::group(
     Route::post('/blogger/info',[BloggerController::class, 'info']);
     //答主的咨询评价
     Route::post('/ask/bloggerevalist',[AskController::class, 'bloggerEvaList']);
-    //轮播
+    //问答首页轮播
     Route::post('/ask/banner',[AskController::class, 'banner']);
-    //咨询列表
+    //问答咨询列表
     Route::post('/ask/asklist',[AskController::class, 'askList']);
-    //咨询详情
+    //问答咨询详情
     Route::post('/ask/askinfo',[AskController::class, 'askInfo']);
+    //查询用户是否有未读问答信息
+    Route::get('/massages/getAskMessageCount', [MessagesController::class, 'getAskMessageCount']);
+
 
     // 测试
     Route::get('/test', [IndexController::class, 'test']);

app/Wen/Utils/OrderUtils.php

@@ -293,7 +293,7 @@ class OrderUtils{
                                 UserUtils::update_user_financial($the_user->id,31, $pay_amount, '用户(id:'.$WxOrder->user_id.')付费获取了你的'.$chat_content);
                             }
                             $chat_content = '我付费￥'.$WxOrder->order_pay_price.'获取了你的'.$chat_content. (!_empty_($reason) ? '，并留言：'.$reason : '');
-                            $chatmodel = WxContRepositories::add($WxOrder->user_id, $the_user->id, $chat_content, '', '', 0, 0, 0, 0, 0);
+                            $chatmodel = WxContRepositories::add($WxOrder->user_id, $the_user->id, $chat_content, '', '', 0, 0, 0, 0, 0);//普通聊天
                             if($chatmodel) {
                                 $websocket_id = GatewayUtils::uid2client_id($the_user->id);
                                 if ($websocket_id) {

app/Wen/Utils/UserUtils.php

@@ -1587,7 +1587,7 @@ class UserUtils{
             if($users_id){
                 foreach ($users_id as $to_id){
                     if($to_id && $to_id > 0){
-                        WxContRepositories::add($assistant_user, $to_id, $content, '', '', 0, 0);
+                        WxContRepositories::add($assistant_user, $to_id, $content, '', '', 0, 0);//普通聊天
                         $websocket_id = GatewayUtils::uid2client_id($to_id);
                         if($websocket_id){
                             GatewayUtils::success($websocket_id, 5, ['chat_content'=>strip_tags($content), 'chat_image'=>'',
@@ -1597,7 +1597,7 @@ class UserUtils{
                 }
             }
         }else{
-            WxContRepositories::add($assistant_user, $to_user_id, $content, '', '', 0, 0);
+            WxContRepositories::add($assistant_user, $to_user_id, $content, '', '', 0, 0);//普通聊天
             $websocket_id = GatewayUtils::uid2client_id($to_user_id);
             if($websocket_id){
                 GatewayUtils::success($websocket_id, 5, ['chat_content'=>strip_tags($content), 'chat_image'=>'',