数据优化

application/api/controller/Message.php

@@ -49,6 +49,7 @@ class Message extends Common
         // 参数
         $params = $this->data_post;
         $params['user'] = $this->user;
+        $params['user_type'] = 'user';
 
         // 消息更新未已读
         MessageService::MessageRead($params);

application/api/controller/Order.php

@@ -50,6 +50,7 @@ class Order extends Common
         // 参数
         $params = $this->data_post;
         $params['user'] = $this->user;
+        $params['user_type'] = 'user';
 
         // 分页
         $number = 10;

application/api/controller/Userintegral.php

@@ -50,6 +50,7 @@ class UserIntegral extends Common
         // 参数
         $params = $this->data_post;
         $params['user'] = $this->user;
+        $params['user_type'] = 'user';
 
         // 分页
         $number = 10;

application/index/controller/Userintegral.php

@@ -50,6 +50,7 @@ class UserIntegral extends Common
         // 参数
         $params = input();
         $params['user'] = $this->user;
+        $params['user_type'] = 'user';
 
         // 分页
         $number = 10;

application/service/IntegralService.php

@@ -69,12 +69,20 @@ class IntegralService
      */
     public static function UserIntegralLogListWhere($params = [])
     {
+        // 用户类型
+        $user_type = isset($params['user_type']) ? $params['user_type'] : 'user';
+
+        // 条件初始化
         $where = [];
 
-        // 用户id
-        if(!empty($params['user']))
+        // 用户类型
+        if(isset($params['user_type']) && $params['user_type'] == 'user')
         {
-            $where[] = ['user_id', '=', $params['user']['id']];
+            // 用户id
+            if(!empty($params['user']))
+            {
+                $where[] = ['user_id', '=', $params['user']['id']];
+            }
         }
 
         if(!empty($params['keywords']))

application/service/MessageService.php

@@ -62,6 +62,10 @@ class MessageService
      */
     public static function MessageListWhere($params = [])
     {
+        // 用户类型
+        $user_type = isset($params['user_type']) ? $params['user_type'] : 'user';
+
+        // 条件初始化
         $where = [
             ['is_delete_time', '=', 0],
         ];
@@ -75,8 +79,6 @@ class MessageService
         // 用户类型
         if(isset($params['user_type']) && $params['user_type'] == 'user')
         {
-            $where[] = ['user_is_delete_time', '=', 0];
-
             // 用户id
             if(!empty($params['user']))
             {

application/service/OrderService.php

@@ -452,7 +452,6 @@ class OrderService
         // 条件初始化
         $where = [
             ['is_delete_time', '=', 0],
-            ['user_is_delete_time', '=', 0],
         ];
 
         // id
@@ -460,11 +459,17 @@ class OrderService
         {
             $where[] = ['id', '=', intval($params['id'])];
         }
-
-        // 用户id
-        if(!empty($params['user']))
+        
+        // 用户类型
+        if(isset($params['user_type']) && $params['user_type'] == 'user')
         {
-            $where[] = ['user_id', '=', $params['user']['id']];
+            $where[] = ['user_is_delete_time', '=', 0];
+
+            // 用户id
+            if(!empty($params['user']))
+            {
+                $where[] = ['user_id', '=', $params['user']['id']];
+            }
         }
 
         if(!empty($params['keywords']))