1

app/common/repositories/user/UserRepository.php

@@ -2700,34 +2700,36 @@ class UserRepository extends BaseRepository
 //    添加冻结奖金
     public function addFrozenBrokerage($uid, $num)
     {
-        if ($num>0){
+        if ($num <= 0) {
             return true;
         }
         $info = $this->dao->get($uid);
-        $after_brokerage = bcadd($info['brokerage_price'], $num, 2);
+        $after_brokerage = bcadd($info['freeze_brokerage'], $num, 2);
         $userBillRepository = app()->make(UserBillRepository::class);
         $userBillRepository->incBill($uid, 'freeze_brokerage', 'freeze_brokerage', [
             'link_id' => 0,
             'status' => 1,
             'title' => '冻结奖金',
             'number' => $num,
-            'mark' => '积分自动提现，超出份额'.$num.'元，作为冻结奖金',
-            'balance' =>$after_brokerage
+            'mark' => '积分自动提现，超出份额' . $num . '元，作为冻结奖金',
+            'balance' => $after_brokerage
         ]);
-
+        User::where('uid', $uid)->update(['freeze_brokerage' => $after_brokerage]);
     }
+
 //    检测到份额后扣除份额提出冻结奖金
-    public function extractBrokerage($uid){
+    public function extractBrokerage($uid)
+    {
         $info = $this->dao->get($uid);
-        if ($info['freeze_brokerage'] <=0){
+        if ($info['freeze_brokerage'] <= 0) {
             return true;
         }
         $freeze_brokerage = $info['freeze_brokerage'];
         if ($info['award_range'] > $freeze_brokerage) {  //如果份额大于冻结奖金
             $range = bcsub($info['award_range'], $freeze_brokerage, 2);  //剩余份额
             $num = $freeze_brokerage; //冻结多少奖金
-            $freeze_brokerage=0; //剩余冻结奖金
-        }else{  //如果份额小于冻结奖金
+            $freeze_brokerage = 0; //剩余冻结奖金
+        } else {  //如果份额小于冻结奖金
             $range = 0;  //剩余份额
             $num = bcsub($freeze_brokerage, $info['award_range'], 2); //冻结多少奖金
             $freeze_brokerage = bcsub($info['award_range'], $freeze_brokerage, 2); //剩余冻结奖金
@@ -2739,8 +2741,8 @@ class UserRepository extends BaseRepository
             'status' => 1,
             'title' => '解冻冻结奖金',
             'number' => $num,
-            'mark' => '用户获得分红份额'.$info['award_range'].'元，冻结对应奖金',
-            'balance' =>$freeze_brokerage
+            'mark' => '用户获得分红份额' . $info['award_range'] . '元，冻结对应奖金',
+            'balance' => $freeze_brokerage
         ]);
 //        扣除分红额度
         $userBillRepository->decBill($uid, 'award_range', 'thaw_brokerage', [
@@ -2748,10 +2750,10 @@ class UserRepository extends BaseRepository
             'status' => 1,
             'title' => '解冻冻结奖金',
             'number' => $num,
-            'mark' => '用户获得分红份额'.$info['award_range'].'元，冻结对应奖金',
-            'balance' =>$freeze_brokerage
+            'mark' => '用户获得分红份额' . $info['award_range'] . '元，冻结对应奖金',
+            'balance' => $freeze_brokerage
         ]);
-        User::where('uid', $uid)->update(['freeze_brokerage' => $freeze_brokerage,'award_range'=>$range]);
+        User::where('uid', $uid)->update(['freeze_brokerage' => $freeze_brokerage, 'award_range' => $range]);
     }
 
     /**
@@ -2788,7 +2790,7 @@ class UserRepository extends BaseRepository
 //                    @file_put_contents('quanju2.txt', $all_price . "-减掉手续费的金额\r\n", 8);
 //                }
 //                可提现奖金和份额
-                if ($all_price > $info['award_range']){
+                if ($all_price > $info['award_range']) {
                     $award = bcsub($all_price, $info['award_range'], 2);
                     $this->addFrozenBrokerage($uid, $award);  //冻结奖金
                     $all_price = bcsub($all_price, $award, 2);  //奖金减冻结奖金