提现限制

app/api/controller/admin/StoreOrderController.php

@@ -440,7 +440,7 @@ class StoreOrderController
                     if ($item['number'] > $usermoney)
                         $item['number'] = $usermoney;
                     User::bcDec($item['uid'], 'brokerage_price', $item['number'], 'uid');
-                    UserBill::expend('退款退佣金', $item['uid'], 'now_money', 'brokerage', $item['number'], $orderId, bcsub($usermoney, $item['number'], 2), '订单退款扣除佣金' . floatval($item['number']) . '元');
+                    UserBill::expend('退款退绿积分', $item['uid'], 'now_money', 'brokerage', $item['number'], $orderId, bcsub($usermoney, $item['number'], 2), '订单退款扣除绿积分' . floatval($item['number']));
                 }
             //退款扣除用户积分
             //购买赠送的积分

app/api/controller/user/UserController.php

@@ -81,7 +81,7 @@ class UserController
             $info['vip'] = [];
             $info['store_name'] = [];
         }
-        $info['lock_group_award'] = UserBill::where(['type' => 'brokerage', 'category' => 'now_money', 'pm' => 1, 'status' => 0, 'uid' => $info['uid'], 'title' => '套装极差奖'])->sum('number');
+        $info['lock_group_award'] = UserBill::where(['type' => 'brokerage', 'category' => 'now_money', 'pm' => 1, 'status' => 0, 'uid' => $info['uid'], 'title' => '套装极差奖'])->where('title','in',['套装极差奖','套装津贴绿积分'])->sum('number');
 
         $orders = StoreOrder::where('paid', 1)
             ->where('uid', $info['uid'])

app/models/store/StoreOrder.php

@@ -2312,9 +2312,9 @@ class StoreOrder extends BaseModel
                     }
                 }
                 $proportion = bcmul(bcsub($order['total_price'], $order['cost'], 2), bcdiv($level_award, 100, 2), 2);
-                $mark = "订单号" . $order['order_id'] . '产生极差奖,奖励推广佣金' . $proportion;
+                $mark = "订单号" . $order['order_id'] . '产生津贴绿积分,奖励推广佣金' . $proportion;
                 //TODO 添加推广记录
-                $res1 = UserBill::income('极差奖', $v['uid'], 'now_money', 'brokerage', $proportion, $order['id'], $proportion, $mark);
+                $res1 = UserBill::income('津贴绿积分', $v['uid'], 'now_money', 'brokerage', $proportion, $order['id'], $proportion, $mark);
                 //TODO 添加用户余额
                 $res2 = User::where('uid', $v['uid'])->inc('brokerage', $proportion)->update();
             }
@@ -2539,7 +2539,7 @@ class StoreOrder extends BaseModel
             $brokeragePrice = bcadd($suit_award, $brokeragePrice, 2);
             if ($brokeragePrice > 0) {
                 $mark = '用户' . $userInfo['nickname'] . '（' . $order['uid'] . '）' . '购买套装商品，获得推荐奖励' . $brokeragePrice;
-                $res = $res && UserBill::income('套装推荐奖', $spread['uid'], 'now_money', 'brokerage', $brokeragePrice, $order['id'], bcadd($spread['brokerage_price'], $brokeragePrice, 2), $mark);
+                $res = $res && UserBill::income('奖励积分', $spread['uid'], 'now_money', 'brokerage', $brokeragePrice, $order['id'], bcadd($spread['brokerage_price'], $brokeragePrice, 2), $mark);
                 $res = $res && User::where('uid', $spread['uid'])->inc('brokerage_price', $brokeragePrice)->update();
                 $spread['brokerage_price'] = bcadd($spread['brokerage_price'], $brokeragePrice, 2);
             }
@@ -2571,8 +2571,8 @@ class StoreOrder extends BaseModel
                 if ($brokeragePrice > $send) {
                     $real_send = bcsub($brokeragePrice, $send, 2);
                     if ($real_send > 0) {
-                        $mark = '用户' . $userInfo['nickname'] . '（' . $order['uid'] . '）' . '购买套装商品，获得极差奖励' . $real_send;
-                        $res = $res && UserBill::income('套装极差奖', $spread['uid'], 'now_money', 'brokerage', $real_send, $order['id'], bcadd($balance, $real_send, 2), $mark);
+                        $mark = '用户' . $userInfo['nickname'] . '（' . $order['uid'] . '）' . '购买套装商品，获得津贴绿积分' . $real_send;
+                        $res = $res && UserBill::income('套装津贴绿积分', $spread['uid'], 'now_money', 'brokerage', $real_send, $order['id'], bcadd($balance, $real_send, 2), $mark);
                         $res = $res && User::where('uid', $spread['uid'])->inc('brokerage_price', $real_send)->update();
                         $balance = bcadd($balance, $real_send, 2);
                         $send = $brokeragePrice;
@@ -2670,7 +2670,7 @@ class StoreOrder extends BaseModel
                         $brokeragePrice = bcmul($lay_award['award'], $suit, 2);
                         if ($brokeragePrice > 0) {
                             $mark = '用户' . $userInfo['nickname'] . '（' . $order['uid'] . '）' . '购买套装商品，获得见点奖励' . $brokeragePrice;
-                            $res = $res && UserBill::income('套装见点奖', $spread['uid'], 'now_money', 'brokerage', $brokeragePrice, $order['id'], bcadd($balance, $brokeragePrice, 2), $mark);
+                            $res = $res && UserBill::income('管理积分', $spread['uid'], 'now_money', 'brokerage', $brokeragePrice, $order['id'], bcadd($balance, $brokeragePrice, 2), $mark);
                             $res = $res && User::where('uid', $spread['uid'])->inc('brokerage_price', $brokeragePrice)->update();
                             $balance = bcadd($balance, $brokeragePrice, 2);
                         }
@@ -2700,8 +2700,8 @@ class StoreOrder extends BaseModel
             if ($brokeragePrice > $send_normal) {
                 $real_send = bcsub($brokeragePrice, $send_normal, 2);
                 if ($real_send > 0) {
-                    $mark = '用户' . $userInfo['nickname'] . '（' . $order['uid'] . '）' . '购买' . ($order['use_integral'] > 0 ? '积分' : '普通') . '商品，获得极差奖励' . $real_send;
-                    $res = $res && UserBill::income('极差奖', $spread['uid'], 'now_money', 'brokerage', $real_send, $order['id'], bcadd($balance, $real_send, 2), $mark);
+                    $mark = '用户' . $userInfo['nickname'] . '（' . $order['uid'] . '）' . '购买' . ($order['use_integral'] > 0 ? '积分' : '普通') . '商品，获得津贴绿积分' . $real_send;
+                    $res = $res && UserBill::income('津贴绿积分', $spread['uid'], 'now_money', 'brokerage', $real_send, $order['id'], bcadd($balance, $real_send, 2), $mark);
                     $res = $res && User::where('uid', $spread['uid'])->inc('brokerage_price', $real_send)->update();
                     $send_normal = $brokeragePrice;
                 }
@@ -2788,7 +2788,7 @@ class StoreOrder extends BaseModel
                 if ($brokeragePrice > $send) {
                     $real_send = bcsub($brokeragePrice, $send, 2);
                     if ($real_send > 0) {
-                        $mark = '用户' . $userInfo['nickname'] . '（' . $order['uid'] . '）' . '购买套装商品，获得极差奖励' . $real_send;
+                        $mark = '用户' . $userInfo['nickname'] . '（' . $order['uid'] . '）' . '购买套装商品，获得津贴绿积分' . $real_send;
                         var_dump($mark);
                     }
                 }
@@ -2884,7 +2884,7 @@ class StoreOrder extends BaseModel
             if ($brokeragePrice > $send_normal) {
                 $real_send = bcsub($brokeragePrice, $send_normal, 2);
                 if ($real_send > 0) {
-                    $mark = '用户' . $userInfo['nickname'] . '（' . $order['uid'] . '）' . '购买' . ($order['use_integral'] > 0 ? '积分' : '普通') . '商品，获得极差奖励' . $real_send;
+                    $mark = '用户' . $userInfo['nickname'] . '（' . $order['uid'] . '）' . '购买' . ($order['use_integral'] > 0 ? '积分' : '普通') . '商品，获得津贴绿积分' . $real_send;
                     var_dump($mark);
                 }
             }

app/models/system/SystemAwardLevel.php

@@ -91,7 +91,7 @@ class SystemAwardLevel extends BaseModel
 
     public static function sendBackOrderBrokerage($uid, $level)
     {
-        $list = UserBill::where('award_level', '<=', $level)->where(['type' => 'brokerage', 'category' => 'now_money', 'pm' => 1, 'status' => 0, 'uid' => $uid, 'title' => '套装极差奖'])->select();
+        $list = UserBill::where('award_level', '<=', $level)->where(['type' => 'brokerage', 'category' => 'now_money', 'pm' => 1, 'status' => 0, 'uid' => $uid, 'title' => '津贴绿积分|极差奖'])->where('title','in',['津贴绿积分','极差奖'])->select();
         if ($list) {
             self::beginTrans();
             try {

app/models/user/UserRecharge.php

@@ -166,8 +166,8 @@ class UserRecharge extends BaseModel
             $real_get = bcsub($real_get, $commission_consumer, 2);
             $res1 = User::bcInc($uid, 'now_money', $real_get, 'uid');
             $res3 = User::bcDec($uid, 'brokerage_price', $price, 'uid');
-            $res2 = UserBill::income('用户佣金转入余额', $uid, 'now_money', 'recharge', $real_get, 0, bcadd($user['now_money'], $real_get, 2), '成功转入余额' . floatval($real_get) . '元');
-            $res2 = UserBill::expend('用户佣金转入余额', $uid, 'now_money', 'brokerage', $price, 0, bcsub($user['brokerage_price'], $price, 2), '佣金' . $price . '转余额' . floatval($real_get) . '元，其中手续费' . bcadd($commission_consumer, $commission_gf, 2));
+            $res2 = UserBill::income('用户绿积分转入余额', $uid, 'now_money', 'recharge', $real_get, 0, bcadd($user['now_money'], $real_get, 2), '成功转入余额' . floatval($real_get) . '元');
+            $res2 = UserBill::expend('用户绿积分转入余额', $uid, 'now_money', 'brokerage', $price, 0, bcsub($user['brokerage_price'], $price, 2), '绿积分' . $price . '转余额' . floatval($real_get) . '元，其中手续费' . bcadd($commission_consumer, $commission_gf, 2));
             $extractInfo = [
                 'uid' => $uid,
                 'real_name' => $user['nickname'],