From c5303a92cdc62df6240b17716190c806b5b1570a Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 25 Apr 2024 15:02:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=20=E6=8E=A8=E5=B9=BF=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BE=93=E5=87=BA=E6=98=AF=E5=90=A6=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E7=BB=91=E5=AE=9A=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/user/UserRepository.php      |  8 ++++++--
 app/controller/api/user/User.php              | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/common/repositories/user/UserRepository.php b/app/common/repositories/user/UserRepository.php
index a7c7f61..9069a8b 100644
--- a/app/common/repositories/user/UserRepository.php
+++ b/app/common/repositories/user/UserRepository.php
@@ -1019,7 +1019,9 @@ class UserRepository extends BaseRepository
         $where['spread_uid'] = $uid;
         $query = $this->search($where);
         $count = $query->count();
-        $list = $query->setOption('field', [])->field('uid,avatar,nickname,pay_count,pay_price,spread_count,spread_time')->page($page, $limit)->select();
+        $list = $query->setOption('field', [])
+            ->field('uid,avatar,nickname,pay_count,pay_price,spread_count,spread_time,spread_fixed,spread_limit')
+            ->page($page, $limit)->select();
         return compact('list', 'count');
     }
 
@@ -1042,7 +1044,9 @@ class UserRepository extends BaseRepository
         if (count($where['spread_uids'])) {
             $query = $this->search($where);
             $count = $query->count();
-            $list = $query->setOption('field', [])->field('uid,avatar,nickname,pay_count,pay_price,spread_count,spread_time')->page($page, $limit)->select();
+            $list = $query->setOption('field', [])
+                ->field('uid,avatar,nickname,pay_count,pay_price,spread_count,spread_time,spread_fixed,spread_limit')
+                ->page($page, $limit)->select();
         } else {
             $list = [];
             $count = 0;
diff --git a/app/controller/api/user/User.php b/app/controller/api/user/User.php
index 0a9706f..124dc57 100644
--- a/app/controller/api/user/User.php
+++ b/app/controller/api/user/User.php
@@ -250,17 +250,24 @@ class User extends BaseController
      * @author xaboy
      * @day 2020/6/22
      */
-    public function spread_list()
-    {
-
+    public function spread_list(){
         $where = $this->request->params([ 'sort', 'keyword']);
         [$start,$stop]= $this->request->params(['start','stop'],true);
         $where['spread_time'] = $start&&$stop ? date('Y/m/d',$start).'-'.date('Y/m/d',$stop) : '';
         $level = $this->request->param('level');
         [$page, $limit] = $this->getPage();
-        return app('json')->success($level == 2
-            ? $this->repository->getTwoLevelList($this->request->uid(),$where, $page, $limit)
-            : $this->repository->getOneLevelList($this->request->uid(),$where, $page, $limit));
+        $uid = $this->request->uid();
+        $result = $level == 2 ? $this->repository->getTwoLevelList($uid,$where,$page,$limit) : $this->repository->getOneLevelList($uid,$where,$page,$limit);
+        // 循环处理数据
+        $config = systemConfig(['extension_limit', 'extension_limit_day', 'integral_user_give']);
+        foreach($result['list'] as &$spreadInfo){
+            $spreadInfo['is_temporary'] = 0;
+            if($config['extension_limit'] && $config['extension_limit_day'] && $spreadInfo['spread_limit'] && $spreadInfo['spread_fixed'] == 0) {
+                $spreadInfo['is_temporary'] = 1;
+            }
+        }
+
+        return app('json')->success($result);
     }
 
     /**