commit

app/common.php

@@ -672,3 +672,18 @@ if (!function_exists('get_downline')){
 
     }
 }
+
+if (!function_exists('get_downlines')){
+    //所有下级
+    function get_downlines($members,$id){
+        $arr=array();
+        foreach ($members as $key => $v) {
+            if($v['spread_uid']==$id){  //pid为0的是顶级分类
+                $arr[]=$v['uid'];
+                $arr = array_merge($arr,get_downlines($members,$v['uid']));
+            }
+        }
+        return $arr;
+
+    }
+}

app/models/store/StoreOrder.php

@@ -962,11 +962,11 @@ class StoreOrder extends BaseModel
             }
         }elseif ($prices >= 399){
             if ($top1['level'] == 1){
-                $top1['brokerage_price'] += 20;
+                $top1['brokerage_price'] += 50;
                 $price = 50;
 
             }elseif ($top1['level'] == 2){
-                $top1['brokerage_price'] += 50;
+                $top1['brokerage_price'] += 200;
                 $price = 200;
             }
             if ($price <= 50){

app/models/user/User.php

@@ -555,7 +555,14 @@ class User extends BaseModel
         $model = $model->order($orderBy);
         $model = $model->page($page, $limit);
         $list = $model->select();
-        if ($list) return $list->toArray();
+        if ($list) {
+            foreach ($list as &$item)
+            {
+                $item['order_count'] = StoreOrder::where('uid', $item['uid'])->where('paid', 1)->count();
+                $item['order_price'] = StoreOrder::where('uid', $item['uid'])->where('paid', 1)->sum('pay_price');
+            }
+            return $list->toArray();
+        }
         else return [];
     }
 

app/models/user/UserBill.php

@@ -172,7 +172,7 @@ class UserBill extends BaseModel
         $data = [];
         foreach ($list as $item) {
             $value['time'] = $item['time'];
-            $value['list'] = self::where('id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm')->order('add_time DESC')->select();
+            $value['list'] = self::where('id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm,mark')->order('add_time DESC')->select();
             array_push($data, $value);
         }
         return $data;