commit

app/admin/controller/user/User.php

@@ -411,7 +411,7 @@ class User extends AuthController
         }
         $res_sp = true;
         if ($data['spread_uid'] != $user['spread_uid']) {
-            $res_sp = \app\models\user\User::setSpread($data['spread_uid'], $uid);
+            $res_sp = \app\models\user\User::setSpread($data['spread_uid'], $uid, 1);
         }
         $edit['status'] = $data['status'];
         $edit['real_name'] = $data['real_name'];

app/api/controller/user/UserController.php

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

app/models/user/User.php

@@ -166,9 +166,9 @@ class User extends BaseModel
      * @throws ModelNotFoundException
      * @throws DbException
      */
-    public static function setSpread($spread, $uid)
+    public static function setSpread($spread, $uid ,$type = 0)
     {
-        return UserSpread::setSpread($uid, $spread);
+        return UserSpread::setSpread($uid, $spread, $type);
         //当前用户信息
 //        $userInfo = self::where('uid', $uid)->find();
 //        if (!$userInfo) return true;

app/models/user/UserSpread.php

@@ -46,14 +46,16 @@ class UserSpread extends BaseModel
      * @throws DbException
      * @throws ModelNotFoundException
      */
-    public static function setSpread($uid, $spread_uid)
+    public static function setSpread($uid, $spread_uid, $type = 0)
     {
         if (!$spread_uid) {
             return true;
         }
-        $order = StoreOrder::where('uid', $uid)->count();
-        if ($order > 0){
-            return true;
+        if ($type == 0){
+            $order = StoreOrder::where('uid', $uid)->count();
+            if ($order > 0){
+                return true;
+            }
         }
 
         $sp = $spread_uid;