hrjy 2 gadi atpakaļ
vecāks
revīzija
d566b63221

+ 1 - 1
app/api/controller/user/UserController.php

@@ -64,8 +64,8 @@ class UserController
         $info['commissionCount'] = bcsub($info['brokerage_price'], $info['broken_commission'], 2);
         $info['commissionCount'] = bcsub($info['brokerage_price'], $info['broken_commission'], 2);
         if ($info['commissionCount'] < 0)
         if ($info['commissionCount'] < 0)
             $info['commissionCount'] = 0;
             $info['commissionCount'] = 0;
-        $info['profit'] = UserSingleAward::where('uid', $info['uid'])->sum('money');
         $info['grant'] = UserSingleAward::where('uid', $info['uid'])->sum('grant');
         $info['grant'] = UserSingleAward::where('uid', $info['uid'])->sum('grant');
+        $info['profit'] = UserSingleAward::where('uid', $info['uid'])->sum('money') - $info['grant'];
         UserLevel::setLevelComplete($request->uid());
         UserLevel::setLevelComplete($request->uid());
         return app('json')->success($info);
         return app('json')->success($info);
     }
     }

+ 4 - 0
app/models/user/UserSpread.php

@@ -51,6 +51,10 @@ class UserSpread extends BaseModel
         if (!$spread_uid) {
         if (!$spread_uid) {
             return true;
             return true;
         }
         }
+        $order = StoreOrder::where('uid', $uid)->count();
+        if ($order > 0){
+            return true;
+        }
 
 
         $sp = $spread_uid;
         $sp = $spread_uid;
         $userlist = User::column('uid,spread_uid', 'uid');
         $userlist = User::column('uid,spread_uid', 'uid');