commit

app/api/controller/many/ManyController.php

@@ -87,6 +87,7 @@ class ManyController
         if ($surplus < $data['price']) return app('json')->fail('超过最大可种树额度');
         Db::startTrans();
         if ($many['add_time'] > time()){
+            if ($many['add_time'] - 600 > time()) return app('json')->fail('只能提前十分钟进行,提前种树');
             $advance = SystemConfigService::get('advance');
             $integral = $data['price']* ($advance/100);
             if ($user['integral'] < $integral) return app('json')->fail('阳光不足无法提前投注');

app/api/controller/user/UserController.php

@@ -672,15 +672,15 @@ class UserController
             if (!$user) return app('json')->fail('没有当前用户');
 
             $userInfo = User::where('uid', $request->uid())->find();
-            if ($userInfo['business_integral'] < $data['money']) return app('json')->fail('积分不足');
+            if ($userInfo['integral'] < $data['money']) return app('json')->fail('积分不足');
             User::beginTrans();
-            $user['business_integral'] += $data['money'];
-            $userInfo['business_integral'] -= $data['money'];
+            $user['integral'] += $data['money'];
+            $userInfo['integral'] -= $data['money'];
             try {
                 $user->save();
                 $userInfo->save();
-                UserBill::expend('转账', $userInfo['uid'], 'business_integral', 'sub_business_integral', $data['money'], $userInfo['uid'], $userInfo['now_money'], '给用户'.$user['nickname'].'转商家积分'.$data['money']);
-                UserBill::income('收账', $user['uid'], 'business_integral', 'add_business_integral', $data['money'], $user['uid'], $user['now_money'], '用户'.$userInfo['nickname'].'给你转商家积分'.$data['money']);
+                UserBill::expend('转账', $userInfo['uid'], 'integral', 'sub_integral', $data['money'], $userInfo['uid'], $userInfo['integral'], '给用户'.$user['nickname'].'转阳光积分'.$data['money']);
+                UserBill::income('收账', $user['uid'], 'integral', 'add_integral', $data['money'], $user['uid'], $user['integral'], '用户'.$userInfo['nickname'].'给你转阳光积分'.$data['money']);
                 cache($request->uid(), 1, 5);
                 User::commitTrans();
                 return app('json')->success('成功');

app/models/many/ManyOrder.php

@@ -109,8 +109,8 @@ class ManyOrder extends BaseModel
                     $user1->save();
                 }
                 if ($user2) {
-                    UserBill::income('间推奖励肥料', $user1['uid'], 'white_integral', 'jt_white_integral', $sy2 * 0.7, $user2['spread_uid'], $user2['white_integral'], '间推奖励肥料');
-                    UserBill::income('间推奖励阳光', $user1['uid'], 'integral', 'jt_integral', $sy2 * 0.3, $user2['spread_uid'], $user2['integral'], '间推奖励阳光');
+                    UserBill::income('间推奖励肥料', $user2['uid'], 'white_integral', 'jt_white_integral', $sy2 * 0.7, $user2['spread_uid'], $user2['white_integral'], '间推奖励肥料');
+                    UserBill::income('间推奖励阳光', $user2['uid'], 'integral', 'jt_integral', $sy2 * 0.3, $user2['spread_uid'], $user2['integral'], '间推奖励阳光');
                     $user2->save();
                 }
 
@@ -149,11 +149,6 @@ class ManyOrder extends BaseModel
                             $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
                             $details['integral'] += $jl * 0.3; // 百分之30的商家积分
                             $v1++;
-                        }elseif ($v1 == 1){// 发放v1奖励1次
-                            $jl = ($price*$one)*0.05;//平级的百分之五
-                            $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
-                            $details['integral'] += $jl * 0.3; // 百分之30的商家积分
-                            $v1++;
                         }
                     }
                 }elseif ($details['level'] == 2){
@@ -164,21 +159,11 @@ class ManyOrder extends BaseModel
                             $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
                             $details['integral'] += $jl * 0.3; // 百分之30的商家积分
                             $v2++;
-                        }elseif($v1 == 0 and $v2 == 1) { // 没有发放v1和v2的奖励的奖励
-                            $jl = ($price * $tow)*0.05; // 拿到流水的百分之八
-                            $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
-                            $details['integral'] += $jl * 0.3; // 百分之30的商家积分
-                            $v2++;
                         }elseif ($v1 > 0 and $v2 == 0){// 发放v1奖励，没有发放v2的奖励
                             $jl = $price * ($tow - $one); // 拿到流水减掉v1的百分之五
                             $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
                             $details['integral'] += $jl * 0.3; // 百分之30的商家积分
                             $v2++;
-                        }elseif ($v1 > 0 and $v2 == 1){// 发放v1奖励，发放v2的奖励一次
-                            $jl = ($price * ($tow - $one))*0.05; // 拿到平级的百分之五
-                            $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
-                            $details['integral'] += $jl * 0.3; // 百分之30的商家积分
-                            $v2++;
                         }
 
                     }
@@ -189,41 +174,21 @@ class ManyOrder extends BaseModel
                         $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
                         $details['integral'] += $jl * 0.3; // 百分之30的商家积分
                         $v3++;
-                    }elseif ($v1 == 0 and $v2 == 0 and $v3 == 1) {// 没有发放v1和v2的奖励的奖励
-                        $jl = ($price * $three) * 0.05; // 拿到平级的百分之五
-                        $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
-                        $v3++;
                     }elseif ($v1 > 0 and $v2 == 0 and $v3 == 0){// 发放v1奖励，没有发放v2v3的奖励
                         $jl = $price * ($three - $one); // 拿到流水减掉v1的百分之五
                         $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
                         $details['integral'] += $jl * 0.3; // 百分之30的商家积分
                         $v3++;
-                    }elseif ($v1 > 0 and $v2 == 0 and $v3 == 1){// 发放v1奖励，没有发放v2v3的奖励
-                        $jl = ($price * ($three - $one)) * 0.05; // 拿到平级的百分之五
-                        $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
-                        $v3++;
                     }elseif ($v1 == 0 and $v2 > 0 and $v3 == 0){// 发放v1奖励，发放v2的奖励,没有发放v3的奖励
                         $jl = ($price * ($three - $tow)); // 拿到平级的百分之五
                         $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
                         $details['integral'] += $jl * 0.3; // 百分之30的商家积分
                         $v3++;
-                    }elseif ($v1 == 0 and $v2 > 0 and $v3 == 1){// 发放v1奖励，发放v2的奖励,发放v3的奖励
-                        $jl = ($price * ($three - $tow)) * 0.05; // 拿到平级的百分之五
-                        $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
-                        $v3++;
                     }elseif ($v1 > 0 and $v2 > 0 and $v3 == 0){// 发放v1奖励，发放v2的奖励,发放v3的奖励
                         $jl = ($price * ($three - $tow)); // 拿到平级的百分之五
                         $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
                         $details['integral'] += $jl * 0.3; // 百分之30的商家积分
                         $v3++;
-                    }elseif ($v1 > 0 and $v2 > 0 and $v3 == 1){// 发放v1奖励，发放v2的奖励,发放v3的奖励
-                        $jl = ($price * ($three - $tow)) * 0.05; // 拿到平级的百分之五
-                        $details['white_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
-                        $v3++;
                     }
                 }else{
                     $jl = 0;