1

app/common/repositories/user/UserRepository.php

@@ -2728,36 +2728,37 @@ class UserRepository extends BaseRepository
         $integral_prcie = $integral_prcie['price'];
 
         $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 {  //如果份额小于冻结奖金
-            $range = 0;  //剩余份额
-            $num = bcsub($freeze_brokerage, $info['award_range'], 2); //冻结多少奖金
-            $freeze_brokerage = bcsub($info['award_range'], $freeze_brokerage, 2); //剩余冻结奖金
-        }
+//        if ($info['award_range'] > $freeze_brokerage) {  //如果份额大于冻结奖金
+//            $range = bcsub($info['award_range'], $freeze_brokerage, 2);  //剩余份额
+//            $num = $freeze_brokerage; //冻结多少奖金
+//            $freeze_brokerage = 0; //剩余冻结奖金
+//        } else {  //如果份额小于冻结奖金
+//            $range = 0;  //剩余份额
+//            $num = bcsub($freeze_brokerage, $info['award_range'], 2); //冻结多少奖金
+//            $freeze_brokerage = bcsub($info['award_range'], $freeze_brokerage, 2); //剩余冻结奖金
+//        }
         $userBillRepository = app()->make(UserBillRepository::class);
 //        扣除冻结金额
         $userBillRepository->decBill($uid, 'freeze_brokerage', 'thaw_brokerage', [
             'link_id' => 0,
             'status' => 1,
             'title' => '解冻冻结奖金',
-            'number' => $num,
+            'number' => $freeze_brokerage,
             'mark' => '用户获得分红份额' . $info['award_range'] . '元，冻结对应奖金',
-            'balance' => $freeze_brokerage
+            'balance' => 0
         ]);
 //        根据价格重新转为分红积分
-        $integral = bcmul($num, $integral_prcie, 2);
+        $integral = bcdiv($freeze_brokerage, $integral_prcie, 2);
+        $after_integral = bcadd($info['award_integral'], $integral, 2);
         $userBillRepository->incBill($uid, 'award_integral', 'extract_award', [
             'link_id' => 0,
             'status' => 1,
             'title' => '提取分红积分',
             'number' => $integral,
             'mark' => '用户获得分红份额' . $info['award_range'] . '元，冻结对应奖金，转为分红积分' . $integral . '(积分价格：'.$integral_prcie.')',
-            'balance' => bcsub($info['award_integral'], $integral, 2)
+            'balance' => $after_integral
         ]);
-        $after_integral = bcsub($info['award_integral'], $integral, 2);
+
 
 ////        扣除分红额度
 //        $userBillRepository->decBill($uid, 'award_range', 'thaw_brokerage', [