Kirin 2 年之前
父節點
當前提交
e9368129fd

+ 10 - 0
app/admin/controller/user/User.php

@@ -240,6 +240,7 @@ class User extends AuthController
             }
             $res = $res && UserModel::where('uid', $uid)->update(['level' => $level_id]);
             if ($inserValue) $res && UserTaskFinish::insertAll($inserValue);
+            \app\models\user\User::sendLockBrokerage($uid);
             if ($res) {
                 UserModel::commitTrans();
                 return Json::successful('赠送成功');
@@ -267,6 +268,15 @@ class User extends AuthController
             return Json::fail('清除失败');
     }
 
+    public function send_lock($uid = 0)
+    {
+        if (!$uid) return Json::fail('缺少参数');
+        if (\app\models\user\User::sendLockBrokerage($uid))
+            return Json::successful('释放成功');
+        else
+            return Json::fail('释放失败');
+    }
+
     /**
      * 修改user表状态
      *

+ 7 - 4
app/admin/model/user/User.php

@@ -8,6 +8,7 @@ namespace app\admin\model\user;
 
 use app\admin\model\order\StoreOrder;
 use app\admin\model\system\SystemUserLevel;
+use app\models\user\UserBill;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
 use app\admin\model\wechat\WechatUser;
@@ -127,7 +128,7 @@ class User extends BaseModel
             else if ($where['country'] == 'abroad') $model = $model->where('w.country', '<>', '中国');
         }
         if ($where['level'] !== '') {
-            $model = $model->where('level', $where['level'])->where('clean_time',0);
+            $model = $model->where('level', $where['level'])->where('clean_time', 0);
         }
         if ($where['group_id'] !== '') {
             $model = $model->where('group_id', $where['group_id']);
@@ -174,11 +175,11 @@ class User extends BaseModel
                     $item['sex'] = '女';
                 } else $item['sex'] = '保密';
                 $item['vip_name'] = false;
-                if ($item['identity'] == 0){
+                if ($item['identity'] == 0) {
                     $item['identity'] = '粉丝';
-                }elseif ($item['identity'] == 1){
+                } elseif ($item['identity'] == 1) {
                     $item['identity'] = '店员';
-                }elseif ($item['identity'] == 2){
+                } elseif ($item['identity'] == 2) {
                     $item['identity'] = '店长';
                 }
                 $levelinfo = UserLevel::where('uid', $item['uid'])->where('is_del', 0)->order('grade desc')->field('level_id,is_forever,valid_time')->find();
@@ -186,6 +187,8 @@ class User extends BaseModel
                     if ($levelinfo['is_forever']) $item['vip_name'] = SystemUserLevel::where('id', $levelinfo['level_id'])->value('name');
                     else if (time() > $levelinfo['valid_time']) $item['vip_name'] = SystemUserLevel::where('id', $levelinfo['level_id'])->value('name');
                 }
+                $item['lock_brokerage'] = UserBill::where(['uid' => $item['uid'], 'type' => 'brokerage', 'category' => 'now_money', 'pm' => 1, 'status' => 0, 'lock' => 1])->sum('number');
+                $item['lock_integral'] = UserBill::where(['uid' => $item['uid'], 'type' => 'Level', 'category' => 'integral', 'pm' => 1, 'status' => 0, 'lock' => 1])->sum('number');
             });//->toArray();
         $count = self::setWherePage(self::setWhere($where), $where, ['w.sex', 'w.province', 'w.city', 'u.status', 'u.is_promoter'], ['u.nickname', 'u.uid'])->alias('u')->join('WechatUser w', 'u.uid=w.uid')->count();
         return ['count' => $count, 'data' => $list];

+ 26 - 0
app/admin/view/user/user/index.php

@@ -252,6 +252,12 @@
                                     <i class="layui-icon layui-icon-close-fill" aria-hidden="true"></i> 清除等级</a>
                             </li>
                             {{# } }}
+                            {{# if(d.lock_brokerage>0||d.lock_integral>0){ }}
+                            <li>
+                                <a href="javascript:void(0);" lay-event="send_lock">
+                                    <i class="layui-icon layui-icon-close-fill" aria-hidden="true"></i> 释放佣金积分</a>
+                            </li>
+                            {{# } }}
                         </ul>
                     </script>
                 </div>
@@ -312,6 +318,8 @@
             {field: 'now_money', title: '余额',width:'6%',sort:true,event:'now_money',align:'center'},
             {field: 'pay_count', title: '购买次数',align:'center',width:'6%'},
             {field: 'extract_count_price', title: '累计提现',align:'center',width:'6%'},
+            {field: 'lock_brokerage', title: '冻结佣金',align:'center',width:'6%'},
+            {field: 'lock_integral', title: '冻结积分',align:'center',width:'6%'},
             {field: 'integral', title: '积分',width:'6%',sort:true,event:'integral',align:'center'},
             {field: 'spread_uid_nickname', title: '推荐人',align:'center'},
             // {field: 'sex', title: '性别',width:'4%',align:'center'},
@@ -394,6 +402,24 @@
                     confirm:'是的我要清除'
                 })
                 break;
+            case 'send_lock':
+                $eb.$swal('delete',function(){
+                    $eb.axios.get(layList.U({a:'send_lock',q:{uid:data.uid}})).then(function(res){
+                        if(res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success',res.data.msg);
+                            obj.update({vip_name:false});
+                            layList.reload();
+                        }else
+                            return Promise.reject(res.data.msg || '释放失败')
+                    }).catch(function(err){
+                        $eb.$swal('error',err);
+                    });
+                },{
+                    title:'您确定要释放【'+data.nickname+'】的佣金积分吗?',
+                    text:'释放后无法恢复请谨慎操作',
+                    confirm:'是的我要释放'
+                })
+                break;
             case 'give_level':
                 $eb.createModalFrame(data.nickname+'-赠送会员',layList.Url({a:'give_level',p:{uid:data.uid}}),{w:500,h:300});
                 break;

+ 101 - 64
app/models/user/User.php

@@ -297,7 +297,7 @@ class User extends BaseModel
         if (!$userInfo || !$userInfo['spread_uid'] || $userInfo['spread_uid'] == $orderInfo['uid']) return true;
         if (!User::be(['uid' => $userInfo['spread_uid'], 'is_promoter' => 1])) return self::backOrderBrokerageTwo($orderInfo, $open);
         $cartId = is_string($orderInfo['cart_id']) ? json_decode($orderInfo['cart_id'], true) : $orderInfo['cart_id'];
-        list($realBrokeragePrice, $virtualBrokeragePrice) = StoreProduct::getProductBrokerage($userInfo['uid'],$userInfo['spread_uid'],$cartId);
+        list($realBrokeragePrice, $virtualBrokeragePrice) = StoreProduct::getProductBrokerage($userInfo['uid'], $userInfo['spread_uid'], $cartId);
         //TODO 返佣金额小于等于0 直接返回不返佣金
         if ($realBrokeragePrice <= 0 && $virtualBrokeragePrice <= 0) return true;
         //TODO 获取上级推广员信息
@@ -317,23 +317,23 @@ class User extends BaseModel
         }
         if ($realBrokeragePrice > 0) {
             $spreadUserInfo = User::getUserInfo($userInfo['spread_uid']);
-            $order_count = StoreOrder::where('uid', $userInfo['uid'])->where('paid' , 1)->count();
+            $order_count = StoreOrder::where('uid', $userInfo['uid'])->where('paid', 1)->count();
             $cartInfo = StoreOrderCartInfo::whereIn('cart_id', $cartId)->column('cart_info');
             $repurchase = 0;
             foreach ($cartInfo as $value) {
                 $product = json_decode($value, true);
                 $product_fg = StoreProduct::where('id', $product['product_id'])->value('is_best');
-                if ($product_fg > 0){
+                if ($product_fg > 0) {
                     $repurchase = 1;
                 }
             }
             //TODO 上级推广员返佣之后的金额
 
             //TODO 添加推广记录
-            if ($repurchase == 0){
+            if ($repurchase == 0) {
 
                 $brokerage_price = $realBrokeragePrice * 0.95;// 到账佣金
-                $integral =  $realBrokeragePrice * 0.05;// 到账积分
+                $integral = $realBrokeragePrice * 0.05;// 到账积分
 
                 $mark = $userInfo['nickname'] . '成功消费[实体产品]' . floatval($orderInfo['pay_price']) . '元,奖励推广佣金' . floatval($brokerage_price);
                 $mark1 = $userInfo['nickname'] . '成功消费[实体产品]' . floatval($orderInfo['pay_price']) . '元,奖励推广积分' . floatval($integral);
@@ -345,17 +345,17 @@ class User extends BaseModel
                 $res2 = self::bcInc($userInfo['spread_uid'], 'brokerage_price', $brokerage_price, 'uid');
                 $res2 = self::bcInc($userInfo['spread_uid'], 'integral', $integral, 'uid');
 
-                if ($spreadUserInfo['identity'] == 1){
-                    $uid = getParent($userInfo['spread_uid'],User::select()); //找到最上级
-                    if (count($uid) > 0){
+                if ($spreadUserInfo['identity'] == 1) {
+                    $uid = getParent($userInfo['spread_uid'], User::select()); //找到最上级
+                    if (count($uid) > 0) {
                         $uid1 = array_pop($uid);
                         $user1 = User::where('uid', $uid1)->find();
-                        if ($user1['line'] >= 3){
+                        if ($user1['line'] >= 3) {
                             $amministrazione = User::where('uid', $user1['spread_uid'])->find();// 发放管理奖
-                            if ($amministrazione){
-                                $realBrokeragePrice = $realBrokeragePrice * (sys_config('administration')/100);
+                            if ($amministrazione) {
+                                $realBrokeragePrice = $realBrokeragePrice * (sys_config('administration') / 100);
                                 $brokerage_price = $realBrokeragePrice * 0.95;// 到账佣金
-                                $integral =  $realBrokeragePrice * 0.05;// 到账积分
+                                $integral = $realBrokeragePrice * 0.05;// 到账积分
 
                                 UserBill::income('获得推广佣金', $amministrazione['uid'], 'now_money', 'brokerage', $brokerage_price, $orderInfo['id'], $amministrazione['brokerage_price'] + $brokerage_price, '管理佣金奖励');
                                 UserBill::income('获得推广积分', $amministrazione['uid'], 'integral', 'Level', $integral, $orderInfo['id'], $amministrazione['integral'] + $integral, '管理积分奖励');
@@ -365,12 +365,12 @@ class User extends BaseModel
                             }
                         }
                     }
-                }elseif ($spreadUserInfo['identity'] == 2){
+                } elseif ($spreadUserInfo['identity'] == 2) {
                     self::livello($spreadUserInfo['spread_uid'], $realBrokeragePrice);
                 }
-            }else{
+            } else {
                 $brokerage_price = $realBrokeragePrice * 0.95;// 到账佣金
-                $integral =  $realBrokeragePrice * 0.05;// 到账积分
+                $integral = $realBrokeragePrice * 0.05;// 到账积分
 
                 $mark = $userInfo['nickname'] . '复购成功消费[实体产品]' . floatval($orderInfo['pay_price']) . '元,奖励推广佣金' . floatval($brokerage_price);
                 $mark1 = $userInfo['nickname'] . '复购成功消费[实体产品]' . floatval($orderInfo['pay_price']) . '元,奖励推广积分' . floatval($integral);
@@ -384,7 +384,6 @@ class User extends BaseModel
             }
 
 
-
         }
 //        $res = $res && self::backOrderBrokerageTwo($orderInfo);
 //        $open && self::checkTrans($res);
@@ -400,15 +399,15 @@ class User extends BaseModel
      */
     public static function livello($uid, $price)
     {
-        $uids = getParent_livello( $uid, User::select());
+        $uids = getParent_livello($uid, User::select());
 
-        if (count($uids) > 0){
+        if (count($uids) > 0) {
             // 第一级店长
-            if (isset($uids[0])){
+            if (isset($uids[0])) {
                 $user = User::where('uid', $uids[0])->find();
                 $price1 = $price * 0.7;
                 $brokerage_price = $price1 * 0.95;// 到账佣金
-                $integral =  $price1 * 0.05;// 到账积分
+                $integral = $price1 * 0.05;// 到账积分
 
                 UserBill::income('获得推广佣金', $user['uid'], 'now_money', 'brokerage', $brokerage_price, '', $user['brokerage_price'] + $brokerage_price, '店长平级佣金奖励');
                 UserBill::income('获得推广积分', $user['uid'], 'integral', 'Level', $integral, '', $user['integral'] + $integral, '店长平级积分奖励');
@@ -416,17 +415,22 @@ class User extends BaseModel
                 self::bcInc($user['uid'], 'integral', $integral, 'uid'); //发放管理奖
             }
 
-            if (isset($uids[1])){
+            if (isset($uids[1])) {
                 // 第二级店长
                 $user = User::where('uid', $uids[1])->find();
                 $price2 = $price * 0.3;
                 $brokerage_price = $price2 * 0.95;// 到账佣金
-                $integral =  $price2 * 0.05;// 到账积分
-
-                UserBill::income('获得推广佣金', $user['uid'], 'now_money', 'brokerage', $brokerage_price, '', $user['brokerage_price'] + $brokerage_price, '店长平级佣金奖励');
-                UserBill::income('获得推广积分', $user['uid'], 'integral', 'Level', $integral, '', $user['integral'] + $integral, '店长平级积分奖励');
-                self::bcInc($user['uid'], 'brokerage_price', $brokerage_price, 'uid'); //发放管理奖
-                self::bcInc($user['uid'], 'integral', $integral, 'uid'); //发放管理奖
+                $integral = $price2 * 0.05;// 到账积分
+
+                if (UserLevel::getUserLevelInfo(UserLevel::getUserLevel($uids[1]), 'level_id') < 2) {
+                    UserBill::income('获得推广佣金', $user['uid'], 'now_money', 'brokerage', $brokerage_price, '', $user['brokerage_price'] + $brokerage_price, '店长平级佣金奖励', 0, 1);
+                    UserBill::income('获得推广积分', $user['uid'], 'integral', 'Level', $integral, '', $user['integral'] + $integral, '店长平级积分奖励', 0, 1);
+                } else {
+                    UserBill::income('获得推广佣金', $user['uid'], 'now_money', 'brokerage', $brokerage_price, '', $user['brokerage_price'] + $brokerage_price, '店长平级佣金奖励');
+                    UserBill::income('获得推广积分', $user['uid'], 'integral', 'Level', $integral, '', $user['integral'] + $integral, '店长平级积分奖励');
+                    self::bcInc($user['uid'], 'brokerage_price', $brokerage_price, 'uid'); //发放管理奖
+                    self::bcInc($user['uid'], 'integral', $integral, 'uid'); //发放管理奖
+                }
             }
 
         }
@@ -510,6 +514,41 @@ class User extends BaseModel
         return true;
     }
 
+    /**
+     * 发放实际商品佣金
+     * @param $orderInfo
+     * @return bool
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public static function sendLockBrokerage($uid)
+    {
+        $list = UserBill::where(['uid' => $uid, 'type' => 'brokerage', 'category' => 'now_money', 'pm' => 1, 'status' => 0, 'lock' => 1])->select();
+        $list2 = UserBill::where(['uid' => $uid, 'type' => 'Level', 'category' => 'integral', 'pm' => 1, 'status' => 0, 'lock' => 1])->select();
+        if ($list || $list2) {
+//            self::beginTrans();
+            try {
+                foreach ($list as $v) {
+                    self::bcInc($v['uid'], 'brokerage_price', $v['number'], 'uid');
+                    $balance = self::getUserInfo($v['uid'])['brokerage_price'];
+                    UserBill::where('id', $v['id'])->update(['add_time' => time(), 'status' => 1, 'balance' => $balance]);
+                }
+                foreach ($list2 as $v) {
+                    $balance = self::getUserInfo($v['uid'])['integral'];
+                    self::bcInc($v['uid'], 'integral', $v['number'], 'uid');
+                    UserBill::where('id', $v['id'])->update(['add_time' => time(), 'status' => 1, 'balance' => $balance]);
+                }
+//                self::commitTrans();
+                return true;
+            } catch (Exception $e) {
+//                self::rollbackTrans();
+                return false;
+            }
+        }
+        return true;
+    }
+
 
     /**
      * 获取推荐人 暂无使用
@@ -854,29 +893,29 @@ class User extends BaseModel
     public static function upgrade($uid)
     {
         $user = User::where('uid', $uid)->find();
-        if ($user['identity'] == 0){
+        if ($user['identity'] == 0) {
             $price = StoreOrder::where('uid', $uid)->where('paid', 1)->sum('pay_price');
-            if ($price >= sys_config('cumulative')){
+            if ($price >= sys_config('cumulative')) {
                 $user['identity'] = 1;
-                if ($user['spread_uid']){
+                if ($user['spread_uid']) {
                     $spd = User::where('uid', $user['spread_uid'])->find();
                     $user['line'] = $spd['lines'] + 1;
                     $spd['lines'] += 1;
                     $spd->save();
                 }
             }
-        }elseif ($user['identity'] == 1){
+        } elseif ($user['identity'] == 1) {
             $count = User::where('spread_uid', $user['uid'])->where('identity', 1)->count();
-            if ($count >= sys_config('push_clerk')){
+            if ($count >= sys_config('push_clerk')) {
                 $user['identity'] = 2;
             }
 
         }
         $res = $user->save();
-        if ($user['spread_uid']){
+        if ($user['spread_uid']) {
             $spd = User::where('uid', $user['spread_uid'])->find();
             $count = User::where('spread_uid', $spd['uid'])->where('identity', 1)->count();
-            if ($count >= sys_config('push_clerk')){
+            if ($count >= sys_config('push_clerk')) {
                 $spd['identity'] = 2;
             }
             $spd->save();
@@ -894,26 +933,25 @@ class User extends BaseModel
      */
     public static function bonus()
     {
-        if (!cache('bonus')){
+        if (!cache('bonus')) {
             $user = User::select();
-            foreach ($user as $item)
-            {
+            foreach ($user as $item) {
                 $start_time = date('Y-m-01 00:00:00', strtotime('-1 month'));
-                $end_time = date('Y-m-d 23:59:59', strtotime(-date('d').'day'));
+                $end_time = date('Y-m-d 23:59:59', strtotime(-date('d') . 'day'));
                 $price = StoreOrder::whereBetweenTime('add_time', $start_time, $end_time)->where('paid', 1)->where('uid', $item['uid'])->sum('pay_price');// 月结
-                if ($item['spread_uid'] > 0 and $price > 0){
+                if ($item['spread_uid'] > 0 and $price > 0) {
                     $spread = getParents($item['spread_uid'], $user->toArray());// 找到所有上级
                     $v1 = 0;
                     $v2 = 0;
                     $v3 = 0;
-                    $one = sys_config('area')/100; // 区代
-                    $tow = sys_config('city')/100; // 市代
-                    $three = sys_config('partner')/100;// 合伙人
+                    $one = sys_config('area') / 100; // 区代
+                    $tow = sys_config('city') / 100; // 市代
+                    $three = sys_config('partner') / 100;// 合伙人
                     foreach ($spread as $value) {
                         $details = User::where('uid', $value)->find();
-                        if ($details['level'] > 0){
-                            if ($details['level'] == 1){
-                                if ($v2 == 0 and $v3 == 0){
+                        if ($details['level'] > 0) {
+                            if ($details['level'] == 1) {
+                                if ($v2 == 0 and $v3 == 0) {
                                     // 没有发放市代和合伙人的奖励
                                     if ($v1 == 0) { // 没有发放v1的奖励
                                         $jl = $price * $one;
@@ -921,7 +959,7 @@ class User extends BaseModel
                                         $v1++;
                                     }
                                 }
-                            }elseif ($details['level'] == 2) {
+                            } elseif ($details['level'] == 2) {
                                 if ($v3 == 0) {
                                     // 没有发放合伙人的奖励
                                     if ($v1 == 0 and $v2 == 0) { // 没有发放区代和市代的奖励的奖励
@@ -950,25 +988,25 @@ class User extends BaseModel
 //                                    $v3++;
 //                                }
 //                            }
-                            if ($jl > 0){
+                            if ($jl > 0) {
                                 $brokerage_price = $jl * 0.95;// 到账佣金
                                 $integral = $jl * 0.05;// 到账积分
                                 User::where('uid', $value)->inc('brokerage_price', $brokerage_price)->update();
                                 User::where('uid', $value)->inc('integral', $integral)->update();
                                 if ($details['level'] == 3) {
-                                    $bl =  $three;
+                                    $bl = $three;
                                     if ($v2 > 0 and $v1 > 0) $bl -= $tow;
                                     if ($v2 > 0 and $v1 == 0) $bl -= $tow;
                                     if ($v2 == 0 and $v1 > 0) $bl -= $one;
 
                                 }
-                                if ($details['level'] == 2){
-                                    $bl =  $tow;
+                                if ($details['level'] == 2) {
+                                    $bl = $tow;
                                     if ($v1 > 0) $bl -= $one;
                                 }
-                                if ($details['level'] == 1) $bl =  $one;
-                                UserBill::income('获得推广佣金', $details['uid'], 'now_money', 'brokerage', $brokerage_price, $item['uid'],$details['brokerage_price'] + $brokerage_price, '用户'.$item['uid'].'月结'.$price.'团队奖励比例'.$bl.'的95%佣金');
-                                UserBill::income('获得推广积分', $details['uid'], 'integral', 'bonus', $integral, $item['uid'],$details['integral'] + $integral, '用户'.$item['uid'].'月结'.$price.'团队奖励比例'.$bl.'的5%积分');
+                                if ($details['level'] == 1) $bl = $one;
+                                UserBill::income('获得推广佣金', $details['uid'], 'now_money', 'brokerage', $brokerage_price, $item['uid'], $details['brokerage_price'] + $brokerage_price, '用户' . $item['uid'] . '月结' . $price . '团队奖励比例' . $bl . '的95%佣金');
+                                UserBill::income('获得推广积分', $details['uid'], 'integral', 'bonus', $integral, $item['uid'], $details['integral'] + $integral, '用户' . $item['uid'] . '月结' . $price . '团队奖励比例' . $bl . '的5%积分');
                             }
                             $jl = 0;
                         }
@@ -989,7 +1027,7 @@ class User extends BaseModel
     public static function getkeytoid($key)
     {
         $rs = self::order('uid DESC')->find();
-        return $rs['uid']+1;
+        return $rs['uid'] + 1;
     }
 
     /**
@@ -1002,19 +1040,18 @@ class User extends BaseModel
     public static function creation()
     {
         $user = User::where('level', 4)->select();
-        if (count($user) > 0){
+        if (count($user) > 0) {
             $start_time = date('Y-m-01 00:00:00', strtotime('-1 month'));
-            $end_time = date('Y-m-d 23:59:59', strtotime(-date('d').'day'));
-            $price = StoreOrder::whereBetweenTime('add_time',$start_time, $end_time)->where('paid', 1)->sum('pay_price');// 月结
-            if ($price > 0){
-                foreach ($user as $item)
-                {
-                    $brokerage_price = ($price * sys_config('link')/100) * 0.95;// 到账佣金
-                    $integral =  ($price * sys_config('link')/100) * 0.05;// 到账积分
+            $end_time = date('Y-m-d 23:59:59', strtotime(-date('d') . 'day'));
+            $price = StoreOrder::whereBetweenTime('add_time', $start_time, $end_time)->where('paid', 1)->sum('pay_price');// 月结
+            if ($price > 0) {
+                foreach ($user as $item) {
+                    $brokerage_price = ($price * sys_config('link') / 100) * 0.95;// 到账佣金
+                    $integral = ($price * sys_config('link') / 100) * 0.05;// 到账积分
                     User::where('uid', $item['uid'])->inc('brokerage_price', $brokerage_price)->update();
                     User::where('uid', $item['uid'])->inc('integral', $integral)->update();
-                    UserBill::income('联创分红佣金', $item['uid'], 'now_money', 'brokerage', $brokerage_price, $item['uid'],$item['brokerage_price'] + $brokerage_price, '联创分红奖励比例'.(sys_config('link')/100).'的95%佣金');
-                    UserBill::income('联创分红积分', $item['uid'], 'integral', 'creation', $integral, $item['uid'],$item['integral'] + $integral, '联创分红奖励比例'.(sys_config('link')/100).'的5%积分');
+                    UserBill::income('联创分红佣金', $item['uid'], 'now_money', 'brokerage', $brokerage_price, $item['uid'], $item['brokerage_price'] + $brokerage_price, '联创分红奖励比例' . (sys_config('link') / 100) . '的95%佣金');
+                    UserBill::income('联创分红积分', $item['uid'], 'integral', 'creation', $integral, $item['uid'], $item['integral'] + $integral, '联创分红奖励比例' . (sys_config('link') / 100) . '的5%积分');
                 }
             }
 

+ 6 - 6
app/models/user/UserBill.php

@@ -34,7 +34,7 @@ class UserBill extends BaseModel
 
     use ModelTrait;
 
-    public static function income($title, $uid, $category, $type, $number, $link_id = 0, $balance = 0, $mark = '', $status = 1)
+    public static function income($title, $uid, $category, $type, $number, $link_id = 0, $balance = 0, $mark = '', $status = 1, $lock = 0)
     {
         $pm = 1;
         $add_time = time();
@@ -61,11 +61,11 @@ class UserBill extends BaseModel
      */
     public static function userBillList($uid, $page, $limit, $category = 'integral', $where = [])
     {
-        if ($category == 'brokerage'){
+        if ($category == 'brokerage') {
             if ($page) {
                 $list = self::where('uid', $uid)
                     ->where('category', 'now_money')
-                    ->where('type', 'in','brokerage,extract')
+                    ->where('type', 'in', 'brokerage,extract')
                     ->field('mark,pm,number,add_time')
                     ->where('status', 1)
                     ->where($where)
@@ -75,7 +75,7 @@ class UserBill extends BaseModel
             } else {
                 $list = self::where('uid', $uid)
                     ->where('category', 'now_money')
-                    ->where('category', 'in','brokerage,extract')
+                    ->where('category', 'in', 'brokerage,extract')
                     ->field('mark,pm,number,add_time')
                     ->where('status', 1)
                     ->where($where)
@@ -90,7 +90,7 @@ class UserBill extends BaseModel
                 $v['number'] = floatval($v['number']);
             }
 
-        }else{
+        } else {
             if ($page) {
                 $list = self::where('uid', $uid)
                     ->where('category', $category)
@@ -104,7 +104,7 @@ class UserBill extends BaseModel
             } else {
                 $list = self::where('uid', $uid)
                     ->where('category', $category)
-                    ->where('category', 'notIn','brokerage,extract')
+                    ->where('category', 'notIn', 'brokerage,extract')
                     ->field('mark,pm,number,add_time')
                     ->where('status', 1)
                     ->where($where)

+ 2 - 0
app/models/user/UserLevel.php

@@ -89,6 +89,7 @@ class UserLevel extends BaseModel
             $data['is_forever'] = $vipinfo->is_forever;
             $data['valid_time'] = $add_valid_time;
             User::where('uid', $uid)->update(['level' => $level_id]);
+            User::sendLockBrokerage($uid);
             return self::where('uid', $uid)->where('level_id', $level_id)->update($data);
         } else {
             $data = [
@@ -109,6 +110,7 @@ class UserLevel extends BaseModel
             $res = self::create($data);
             if (!$res) return false;
             User::where('uid', $uid)->update(['level' => $level_id]);
+            User::sendLockBrokerage($uid);
             return $res;
         }
     }