commit

app/api/controller/user/UserController.php

@@ -3,6 +3,7 @@
 namespace app\api\controller\user;
 
 use app\http\validates\user\AddressValidate;
+use app\models\many\ManyOrder;
 use app\models\system\SystemCity;
 use app\models\user\UserEnter;
 use app\models\user\UserVisit;
@@ -691,4 +692,39 @@ class UserController
         return app('json')->fail('参数传入错误');
 
     }
+
+    /**
+     * 团队下级人数和流水
+     * @param Request $request
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function dow(Request $request)
+    {
+        $user = User::select();
+        $userId = get_downline_dow($user, $request->uid());
+        $data = [
+            'count' => 0,
+            'user_list' => [],
+            'user_price' => 0
+        ];
+        if (count($userId) > 0){
+            $count = count($userId);
+            $userList = User::where('uid', 'in', $userId)
+                ->field('uid,nickname,avatar,add_time')
+                ->select();
+            foreach ($userList as &$item){
+                $item['price'] =  ManyOrder::where('uid', $item['uid'])->where('status', 1)->sum('price');
+            }
+            $userPrice = ManyOrder::where('uid', 'in', $userId)->where('status', 1)->sum('price');
+            $data = [
+                'count' => $count,
+                'user_price' => $userPrice,
+                'user_list' => $userList
+            ];
+        }
+        return app('json')->success($data);
+    }
 }

app/common.php

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

app/models/many/ManyOrder.php

@@ -103,13 +103,13 @@ class ManyOrder extends BaseModel
                     UserBill::income('种树成功补贴阳光积分', $user['uid'], 'purple_integral', 'zccg_purple_integral', $purple_integral, $user['spread_uid'], $user['purple_integral'], '种树成功补贴'.$many['name'].'-第'.$item['stage'].'期阳光积分');
                     UserBill::income('种树成功补贴商城积分', $user['uid'], 'integral', 'zccg_integral', $business_integral, $user['spread_uid'], $user['integral'], '种树成功补贴'.$many['name'].'-第'.$item['stage'].'期商家积分');
                     if ($user1){
-                        UserBill::income('直推奖励阳光积分', $user1['uid'], 'purple_integral', 'zccg_purple_integral', $sy1*0.7, $user1['spread_uid'], $user1['purple_integral'], '直推奖励阳光积分');
-                        UserBill::income('直推奖励商城积分', $user1['uid'], 'integral', 'zccg_integral', $sy1*0.3, $user1['spread_uid'], $user1['integral'], '直推奖励商家积分');
+                        UserBill::income('直推奖励阳光积分', $user1['uid'], 'purple_integral', 'zt_purple_integral', $sy1*0.7, $user1['spread_uid'], $user1['purple_integral'], '直推奖励阳光积分');
+                        UserBill::income('直推奖励商城积分', $user1['uid'], 'integral', 'zt_integral', $sy1*0.3, $user1['spread_uid'], $user1['integral'], '直推奖励商家积分');
                         $user1->save();
                     }
                     if ($user2){
-                        UserBill::income('间推奖励阳光积分', $user1['uid'], 'purple_integral', 'purple_integral', $sy2*0.7, $user2['spread_uid'], $user2['purple_integral'], '间推奖励阳光积分');
-                        UserBill::income('间推奖励商城积分', $user1['uid'], 'integral', 'zccg_integral', $sy2*0.3, $user2['spread_uid'], $user2['integral'], '间推奖励商家积分');
+                        UserBill::income('间推奖励阳光积分', $user1['uid'], 'purple_integral', 'jt_purple_integral', $sy2*0.7, $user2['spread_uid'], $user2['purple_integral'], '间推奖励阳光积分');
+                        UserBill::income('间推奖励商城积分', $user1['uid'], 'integral', 'jt_integral', $sy2*0.3, $user2['spread_uid'], $user2['integral'], '间推奖励商家积分');
                         $user2->save();
                     }
                 }
@@ -130,7 +130,7 @@ class ManyOrder extends BaseModel
             $user = User::select();
             foreach ($user as $item)
             {
-                $price = ManyOrder::whereBetweenTime('return_time', strtotime('yesterday'), strtotime('today'))->where('uid', $item['uid'])->sum('price');// 昨天众筹成功返还的金额流水
+                $price = ManyOrder::whereBetweenTime('return_time', strtotime('yesterday'), strtotime('today'))->where('status', 1)->where('uid', $item['uid'])->sum('price');// 昨天众筹成功返还的金额流水
                 if ($item['spread_uid'] > 0 and $price > 0){
                     $spread = getParent($item['uid']);// 找到所有上级
                     $v1 = 0;
@@ -228,8 +228,8 @@ class ManyOrder extends BaseModel
                         }
                         if ($jl > 0){
                             $details->save();
-                            UserBill::income('团队奖励阳光积分', $details['uid'], 'purple_integral', 'team', $jl * 0.7, 0,$details['purple_integral'], 'v'.$details['level'].'团队奖励阳光积分');
-                            UserBill::income('团队奖励商城积分', $details['uid'], 'business_integral', 'team', $jl * 0.3, 0,$details['integral'], 'v'.$details['level'].'团队奖励商城积分');
+                            UserBill::income('团队奖励阳光积分', $details['uid'], 'purple_integral', 'td_purple_integral', $jl * 0.7, 0,$details['purple_integral'], 'v'.$details['level'].'团队奖励阳光积分');
+                            UserBill::income('团队奖励商城积分', $details['uid'], 'integral', 'td_integral', $jl * 0.3, 0,$details['integral'], 'v'.$details['level'].'团队奖励商城积分');
                         }
                         $jl = 0;
                     }
@@ -258,8 +258,8 @@ class ManyOrder extends BaseModel
                         $details['purple_integral'] += ($price * ($details['flowing_water'] / 100)) * 0.7; // 百分之70的紫积分
                         $details['integral'] += ($price * ($details['flowing_water'] / 100)) * 0.3; // 百分之30的商家积分
                         $details->save();
-                        UserBill::income('分红流水奖励阳光积分', $details['uid'], 'purple_integral', 'team', ($price * ($details['flowing_water'] / 100)) * 0.7, 0, $details['purple_integral'], '分红流水奖励阳光积分');
-                        UserBill::income('分红流水奖励商城积分', $details['uid'], 'business_integral', 'team', ($price * ($details['flowing_water'] / 100)) * 0.3, 0, $details['business_integral'], '分红流水奖励商城积分');
+                        UserBill::income('分红流水奖励阳光积分', $details['uid'], 'purple_integral', 'team_purple_integral', ($price * ($details['flowing_water'] / 100)) * 0.7, 0, $details['purple_integral'], '分红流水奖励阳光积分');
+                        UserBill::income('分红流水奖励商城积分', $details['uid'], 'integral', 'team_integral', ($price * ($details['flowing_water'] / 100)) * 0.3, 0, $details['integral'], '分红流水奖励商城积分');
                     }
                 }
             }

app/models/user/User.php

@@ -760,17 +760,17 @@ class User extends BaseModel
                         if ($item['area'] == '') {//市代理
                             $purple_integral = ($order_price * 0.005) * 0.7;
                             $business_integral = ($order_price * 0.005) * 0.3;
-                            $details['purple_integral'] = ($order_price * 0.005) * 0.7;
-                            $details['business_integral'] = ($order_price * 0.005) * 0.3;
+                            $details['purple_integral'] += ($order_price * 0.005) * 0.7;
+                            $details['integral'] += ($order_price * 0.005) * 0.3;
                         } else {//区代理
                             $purple_integral = ($order_price * 0.01) * 0.7;
                             $business_integral = ($order_price * 0.01) * 0.3;
-                            $details['purple_integral'] = $purple_integral;
-                            $details['business_integral'] = $business_integral;
+                            $details['purple_integral'] += $purple_integral;
+                            $details['integral'] += $business_integral;
                         }
                         $details->save();
-                        UserBill::income('代理奖励紫积分', $details['uid'], 'purple_integral', 'team', $purple_integral, 0, $details['purple_integral'], $address . '代理奖励紫积分');
-                        UserBill::income('代理奖励商家积分', $details['uid'], 'business_integral', 'team', $business_integral, 0, $details['business_integral'], $address . '代理奖励商家积分');
+                        UserBill::income('代理奖励阳光积分', $details['uid'], 'purple_integral', 'dl_purple_integral', $purple_integral, 0, $details['purple_integral'], $address . '代理奖励阳光积分');
+                        UserBill::income('代理奖励商城积分', $details['uid'], 'integral', 'dl_integral', $business_integral, 0, $details['integral'], $address . '代理奖励商城积分');
 
                     }
                 }

app/register/view/index/down.html

@@ -66,7 +66,7 @@
 <body>
 <div class="div">
     <img class="img" src="/static/img/down.jpg"/>
-    <a href="{$apk}" downLoad="xhg.apk">
+    <a href="{$apk}" downLoad="wlg.apk">
         <div class="button">Android版本下载</div>
     </a>
 </div>

app/register/view/index/index.html

@@ -11,7 +11,7 @@
 </head>
 <body>
 <div class="container">
-    <div class="loginTitle">欢迎注册喜嗨购</div>
+    <div class="loginTitle">欢迎注册微乐购</div>
     <div class="loginText">请认真填写个人信息</div>
     <div class="login-box">
         <div class="username">账号</div>
@@ -70,7 +70,7 @@
         }
         $.ajax({
             type: "post",
-            url: "http://xhg.duolio.cn/api/register",
+            url: "http://wlg.frp.liuniu946.com/api/register",
             data: {account: phone, captcha: code, password: loginPass, spread: invitation},
             dataType: "json",
             success: function (data) {
@@ -111,7 +111,7 @@
         }
         $.ajax({
             type: "post",
-            url: "http://xhg.duolio.cn/api/register/verify",
+            url: "http://wlg.frp.liuniu946.com/api/register/verify",
             data: {phone: phone, type: 'register'},
             dataType: "json",
             success: function (data) {