From 712bda53f49bec3f14bce0877f10195c0c96fd8e Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 10 Jan 2019 11:32:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Message.php        |  1 +
 application/api/controller/Order.php          |  1 +
 application/api/controller/Userintegral.php   |  1 +
 application/index/controller/Userintegral.php |  1 +
 application/service/IntegralService.php       | 14 +++++++++++---
 application/service/MessageService.php        |  6 ++++--
 application/service/OrderService.php          | 15 ++++++++++-----
 7 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/application/api/controller/Message.php b/application/api/controller/Message.php
index c1343a6eb..1a362f69c 100755
--- a/application/api/controller/Message.php
+++ b/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);
diff --git a/application/api/controller/Order.php b/application/api/controller/Order.php
index 21feaaafb..9cf71d5a1 100644
--- a/application/api/controller/Order.php
+++ b/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;
diff --git a/application/api/controller/Userintegral.php b/application/api/controller/Userintegral.php
index c95b3cee2..68f95a352 100755
--- a/application/api/controller/Userintegral.php
+++ b/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;
diff --git a/application/index/controller/Userintegral.php b/application/index/controller/Userintegral.php
index 1e4808e4f..49b060889 100755
--- a/application/index/controller/Userintegral.php
+++ b/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;
diff --git a/application/service/IntegralService.php b/application/service/IntegralService.php
index dd88553ff..56bf23d78 100755
--- a/application/service/IntegralService.php
+++ b/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']))
diff --git a/application/service/MessageService.php b/application/service/MessageService.php
index 34113ce23..8a639565a 100755
--- a/application/service/MessageService.php
+++ b/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']))
             {
diff --git a/application/service/OrderService.php b/application/service/OrderService.php
index cd34f5a6a..33521542b 100755
--- a/application/service/OrderService.php
+++ b/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']))
-- 
GitLab