1

app/common/repositories/user/UserBillRepository.php

@@ -103,6 +103,7 @@ class UserBillRepository extends BaseRepository
             'award/oil_integral' =>'节能油分红积分',
             'award/pack_integral' =>'礼包分红积分',
             'award/confirm_oil_integral' =>'核销节能油获得积分',
+            'award/freeze_integral' =>'解冻奖金为分红积分',
         ],
         'award_unclaimed_range' =>[
             'award/unclaimed_range' =>'下单商品获得冻结份额',

app/common/repositories/user/UserRepository.php

@@ -2744,7 +2744,7 @@ class UserRepository extends BaseRepository
             'status' => 1,
             'title' => '解冻冻结奖金',
             'number' => $freeze_brokerage,
-            'mark' => '用户获得分红份额' . $info['award_range'] . '元，冻结对应奖金',
+            'mark' => '用户获得分红份额' . $info['award_range'] . '元，解冻冻结奖金',
             'balance' => 0
         ]);
 //        根据价格重新转为分红积分
@@ -2753,7 +2753,7 @@ class UserRepository extends BaseRepository
         $userBillRepository->incBill($uid, 'award_integral', 'extract_award', [
             'link_id' => 0,
             'status' => 1,
-            'title' => '提取分红积分',
+            'title' => '解冻奖金转为分红积分',
             'number' => $integral,
             'mark' => '用户获得分红份额' . $info['award_range'] . '元，冻结对应奖金，转为分红积分' . $integral . '(积分价格：'.$integral_prcie.')',
             'balance' => $after_integral
@@ -2808,11 +2808,14 @@ class UserRepository extends BaseRepository
 //                }
 //                可提现奖金和份额
                 if ($all_price > $info['award_range']) {
+                    @file_put_contents('quanju.txt', $all_price . "-冻结总金额\r\n", 8);
+                    @file_put_contents('quanju.txt', $info['award_range'] . "-冻结总份额\r\n", 8);
                     $award = bcsub($all_price, $info['award_range'], 2);
+                    @file_put_contents('quanju.txt', $award . "-总金额扣除份额就是还要冻结的金额\r\n", 8);
                     $this->addFrozenBrokerage($uid, $award);  //冻结奖金
                     $all_price = bcsub($all_price, $award, 2);  //奖金减冻结奖金
                 }
-
+                @file_put_contents('quanju.txt', $award . "-扣除金额后提现的金额\r\n", 8);
                 //用户获得$all_price的佣金
                 $userBillRepository->incBill($uid, 'brokerage', 'extract_award', [
                     'link_id' => 0,