wesmiler преди 11 часа
родител
ревизия
22bb2537a3
променени са 2 файла, в които са добавени 10 реда и са изтрити 12 реда
  1. 7 8
      app/Services/Api/MemberService.php
  2. 3 4
      app/Services/Common/MemberService.php

+ 7 - 8
app/Services/Api/MemberService.php

@@ -234,15 +234,14 @@ class MemberService extends BaseService
             // 滑落节点
             $pointId = 0;
             $points = '';
-            $pointSorts = '';
+            $pointSort = $userId;
             if($rid>0){
                 $pointData = $this->getPointParentId($rid);
                 $pointId = isset($pointData['point_id'])?$pointData['point_id'] : 0;
-                $pointSort = isset($pointData['point_sort']) && $pointData['point_sort']?$pointData['point_sort'] : 0;
+                $pointSort = isset($pointData['point_sort']) && $pointData['point_sort']?$pointData['point_sort'] : $pointSort;
                 if($pointId){
                     $pointParent = $this->model->where(['id'=> $pointId,'mark'=>1])->select(['id','points','point_sort'])->first();
                     $points = isset($pointParent['points']) && $pointParent['points']? $pointParent['points'].$pointId.',' : ($pointId ? $pointId . ',' : '');
-                    $pointSorts = isset($pointParent['point_sort']) && $pointParent['point_sort']? $pointParent['point_sort'].''.$pointSort : $pointSort;
                 }
             }
 
@@ -258,7 +257,7 @@ class MemberService extends BaseService
                 'buy_type' => $areaId,
                 'area_id' => $areaId,
                 'points' => $points,
-                'point_sort' => $pointSorts,
+                'point_sort' => $pointSort,
                 'code' => get_random_code(9, 'Q', $userId),
                 'password' => get_password('a123456'),
                 'login_ip' => get_client_ip(),
@@ -327,7 +326,7 @@ class MemberService extends BaseService
         // 上级
         $userInfo = $this->model->where(['id'=>$userId])->select(['id','parent_id','point_sort','point_id'])->first();
         $parentId = isset($userInfo['parent_id'])?$userInfo['parent_id']:0;
-        $pointSort = isset($userInfo['point_sort'])&&$userInfo['point_sort']?$userInfo['point_sort']:1;
+        $pointSort = isset($userInfo['point_sort'])&&$userInfo['point_sort']?$userInfo['point_sort']:0;
         $model = $this->model->where(['mark'=> 1]);
 
         $model1= clone $model;
@@ -353,7 +352,7 @@ class MemberService extends BaseService
             ->get();
         $userList = $userList? $userList->toArray() : [];
         if($childrenCount < 2){
-            return ['point_id'=>$userId,'point_sort'=>($pointSort*$pointSort+($childrenCount+1)),'index'=>$childrenCount+1];
+            return ['point_id'=>$userId,'point_sort'=>$pointSort?($pointSort*$pointSort+($childrenCount+1)):0,'index'=>$childrenCount+1];
         }
 
 
@@ -365,7 +364,7 @@ class MemberService extends BaseService
         $pointSort = 0;
         foreach ($userList as $item) {
             $id = isset($item['id'])? $item['id'] : 0;
-            $sort = isset($item['point_sort']) && $item['point_sort']? $item['point_sort'] : 1;
+            $sort = isset($item['point_sort']) && $item['point_sort']? $item['point_sort'] : 0;
             $children = isset($item['points_count']) && $item['points_count']? $item['points_count'] : 0;
 
             $points = isset($item['points']) && $item['points']? explode(',', $item['points']) : [];
@@ -378,7 +377,7 @@ class MemberService extends BaseService
                     $pointId = $id;
                     $tempPointLen = $pointLen;
                     $tempChildren = $children+1;
-                    $pointSort = $sort*$sort + $tempChildren;
+                    $pointSort = $sort?($sort*$sort + $tempChildren) : 0;
                     //dump("ID:{$id}-{$children}命中");
                 }
             }

+ 3 - 4
app/Services/Common/MemberService.php

@@ -394,14 +394,13 @@ class MemberService extends BaseService
         // 滑落节点
         $pointId = 0;
         $points = '';
-        $pointSorts = '';
+        $pointSort = $id;
         if($parentId>0){
             $pointData = \App\Services\Api\MemberService::make()->getPointParentId($parentId);
-            $pointSort = isset($pointData['point_sort']) && $pointData['point_sort']?$pointData['point_sort'] : 0;
+            $pointSort = isset($pointData['point_sort']) && $pointData['point_sort']?$pointData['point_sort'] : $pointSort;
             if($pointId){
                 $pointParent = $this->model->where(['id'=> $pointId,'mark'=>1])->select(['id','points','point_sort'])->first();
                 $points = isset($pointParent['points']) && $pointParent['points']? $pointParent['points'].$pointId.',' : ($pointId ? $pointId . ',' : '');
-                $pointSorts = isset($pointParent['point_sort']) && $pointParent['point_sort']? $pointParent['point_sort'].''.$pointSort : $pointSort;
             }
         }
 
@@ -410,7 +409,7 @@ class MemberService extends BaseService
         $info->parents = $parents;
         $info->point_id = $pointId;
         $info->points = $points;
-        $info->point_sort = $pointSorts;
+        $info->point_sort = $pointSort;
         $info->update_time = time();
         if(!$info->save()){
             DB::rollBack();