commit

app/admin/controller/store/StoreProduct.php

@@ -276,6 +276,8 @@ class StoreProduct extends AuthController
             ['store_type', 1],
             ['agent_repurchase', 0],
             ['vip_repurchase', 0],
+            ['push', 0],
+            ['Interposition', 0],
         ]);
         foreach ($data['activity'] as $k => $v) {
             if ($v == '秒杀') {

app/admin/controller/user/User.php

@@ -335,14 +335,14 @@ class User extends AuthController
         $f[] = Form::radio('is_promoter', '推广员', $user->getData('is_promoter'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '关闭']]);
         $f[] = Form::select('spread_uid', '推荐人', (string)$user->getData('spread_uid'))->options(array_merge([['value' => 0, 'label' => '无']], UserModel::where('uid', '<>', $uid)->field('uid as value,nickname as label')->select()->toArray()))->filterable(true);
         $f[] = Form::radio('status', '状态', $user->getData('status'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '锁定']]);
-        $f[] = Form::select('identity', '身份', (string)$user->getData('identity'))->options(
-           [
-               ['value' => 0, 'label' => '普通用户'],
-               ['value' => 1, 'label' => 'vip代理'],
-               ['value' => 2, 'label' => '区域代理']
-           ]
-        )->filterable(true);
-        $f[] = Form::input('proxy_area', '代理区域', $user->getData('proxy_area'));
+//        $f[] = Form::select('identity', '身份', (string)$user->getData('identity'))->options(
+//           [
+//               ['value' => 0, 'label' => '普通用户'],
+//               ['value' => 1, 'label' => 'vip代理'],
+//               ['value' => 2, 'label' => '区域代理']
+//           ]
+//        )->filterable(true);
+//        $f[] = Form::input('proxy_area', '代理区域', $user->getData('proxy_area'));
         $form = Form::make_post_form('添加用户通知', $f, Url::buildUrl('update', array('uid' => $uid)), 5);
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');

app/admin/model/user/User.php

@@ -651,7 +651,7 @@ class User extends BaseModel
         $models = self::setWherePage(self::alias('A'), $where, [], ['A.nickname', 'A.uid'])
             ->join('user_bill B', 'B.uid=A.uid')
             ->group('A.uid')
-            ->where('B.type', 'brokerage')
+            ->where('B.type', 'in','brokerage,shares,team,push,jt_push')
             ->where('B.category', 'now_money')
             ->field('sum(B.number) as sum_number,A.nickname,A.uid,A.now_money,A.brokerage_price');
         if ($where['order'] == '') {
@@ -680,7 +680,7 @@ class User extends BaseModel
     public static function getUserinfo($uid)
     {
         $userinfo = self::where('uid', $uid)->field('nickname,spread_uid,now_money,add_time')->find()->toArray();
-        $userinfo['number'] = (float)UserBill::where('category', 'now_money')->where('uid', $uid)->where('type', 'brokerage')->sum('number');
+        $userinfo['number'] = (float)UserBill::where('category', 'now_money')->where('uid', $uid)->where('type', 'in','brokerage,shares,team,push,jt_push')->sum('number');
         $userinfo['spread_name'] = $userinfo['spread_uid'] ? self::where('uid', $userinfo['spread_uid'])->value('nickname') : '';
         return $userinfo;
     }

app/admin/model/user/UserBill.php

@@ -179,7 +179,7 @@ class UserBill extends BaseModel
     }
     //设置单个用户查询
     public static function setOneWhere($where,$uid){
-        $model=self::where('uid', $uid)->where('category', 'now_money')->where('type', 'brokerage');
+        $model=self::where('uid', $uid)->where('category', 'now_money')->where('type',  'in','brokerage,shares,team,push,jt_push');
         $time['data'] = '';
         if(strlen(trim($where['start_time'])) && strlen(trim($where['end_time']))){
             $time['data'] = $where['start_time'].' - '.$where['end_time'];

app/admin/view/finance/finance/content_info.php

@@ -105,7 +105,7 @@
                         </li>
                         <li class="layui-col-xs4">
                             <div class="backlog-body">
-                                <h3>佣金余额</h3>
+                                <h3>余额</h3>
                                 <p><cite>{$userinfo.now_money}</cite></p>
                             </div>
                         </li>

app/admin/view/store/store_product/create.php

@@ -662,11 +662,11 @@
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">代理复购价格</label>
+                                                <label class="layui-form-label">合伙人复购价格</label>
                                                 <div class="layui-input-block">
                                                     <input type="number" name="agent_repurchase" lay-verify="title"
                                                            autocomplete="off"
-                                                           placeholder="请输入代理复购价格" class="layui-input"
+                                                           placeholder="请输入合伙人复购价格" class="layui-input"
                                                            v-model="formData.agent_repurchase">
                                                 </div>
                                             </div>
@@ -675,15 +675,39 @@
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">vip复购价格</label>
+                                                <label class="layui-form-label">代理商复购价格</label>
                                                 <div class="layui-input-block">
                                                     <input type="number" name="vip_repurchase" lay-verify="title"
-                                                           autocomplete="off" placeholder="请输入赠送积分" class="layui-input"
+                                                           autocomplete="off" placeholder="请输入代理商复购价格" class="layui-input"
                                                            v-model="formData.vip_repurchase">
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
+                                        <div class="grid-demo grid-demo-bg1">
+                                            <div class="layui-form-item">
+                                                <label class="layui-form-label">直推奖励</label>
+                                                <div class="layui-input-block">
+                                                    <input type="number" name="push" lay-verify="title"
+                                                           autocomplete="off" placeholder="请输入直推奖励" class="layui-input"
+                                                           v-model="formData.push">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
+                                        <div class="grid-demo grid-demo-bg1">
+                                            <div class="layui-form-item">
+                                                <label class="layui-form-label">间推奖励</label>
+                                                <div class="layui-input-block">
+                                                    <input type="number" name="Interposition" lay-verify="title"
+                                                           autocomplete="off" placeholder="请输入间推奖励" class="layui-input"
+                                                           v-model="formData.Interposition">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
@@ -1032,6 +1056,8 @@
                 is_best: 0,
                 is_new: 0,
                 is_good: 0,
+                push: 0,
+                Interposition: 0,
                 store_type: 1,
                 is_sub: 0,
                 agent_repurchase: 0,

app/admin/view/user/user/index.php

@@ -327,7 +327,7 @@
             {field: 'sex', title: '性别',width:'4%',align:'center'},
             {field: 'data_time', title: '访问日期',align:'center',width:'12%',templet:'#data_time'},
             // {field: 'status', title: '状态',templet:"#checkboxstatus",width:'6%',align:'center'},
-            {field: 'identity', title: '用户身份',templet:"#identity",width:'6%',align:'center'},
+            // {field: 'identity', title: '用户身份',templet:"#identity",width:'6%',align:'center'},
             {field: 'operate', title: '操作', width: '10%', align: 'center', toolbar: '#barDemo'}
         ];
     });

app/api/controller/user/UserController.php

@@ -26,6 +26,7 @@ use app\models\user\UserExtract;
 use app\models\user\UserNotice;
 use crmeb\services\GroupDataService;
 use crmeb\services\UtilService;
+use think\facade\Db;
 
 /**
  * 用户类
@@ -614,119 +615,18 @@ class UserController
     }
 
     /**
-     * 申请
-     * @param Request $request
-     * @return mixed
-     * @throws DataNotFoundException
-     * @throws DbException
-     * @throws ModelNotFoundException
-     */
-    public function apply(Request $request)
-    {
-        $data = UtilService::postMore([
-            ['type'],
-            ['address'],
-        ]);
-        if (!$data['type'])  return app('json')->fail('传入type');
-        if ($data['type'] == 2){
-            $user = User::where('proxy_area', 'like', '%'.$data['address'].'%')->find();
-            if ($user) return app('json')->fail('该地址已被申请');
-            if (!$data['address']) return app('json')->fail('填写申请地址');
-        }
-        $user = User::where('uid', $request->uid())->find();
-        if ($user['identity'] == 2) return app('json')->fail('已是区域代理');
-        if ($user['identity'] == 1 and $data['type'] == 1)  return app('json')->fail('已是vip代理');
-        $res = UserApply::create([
-            'uid' => $request->uid(),
-            'type' => $data['type'],
-            'address' => $data['address'],
-        ]);
-        if ($res) return app('json')->success('提交申请成功');
-        return app('json')->success('提交申请失败');
-
-    }
-
-    public function apply_list(Request $request)
-    {
-        $data = UtilService::getMore([
-            ['page', 1],
-            ['limit', 10],
-        ]);
-
-        $list = UserApply::where('uid', $request->uid())->page($data['page'], $data['limit'])->select();
-
-        $list = count($list) > 0 ? $list->toArray() : [];
-
-        return app('json')->success($list);
-    }
-
-
-
-    /**
-     * 每月提成
+     * 定时分红
      * @return void
-     * @throws DataNotFoundException
-     * @throws DbException
-     * @throws ModelNotFoundException
      */
     public function bonus()
     {
-        $user = User::where('identity', 2)->where('spread_count', '>=', 1)->select();
-        if (count($user) > 0)
-        {
-            foreach ($user as $item){
-                if ($item['spread_count'] >= 1 and $item['spread_count'] < 2){
-                    $uids = get_downline(User::select()->toArray(), $item['uid']);
-                    $monthFirstDay = strtotime(date('Y-m-01',time()));
-                    $monthLasttDay = strtotime(date('Y-m-t',time()));
-                    $order_price = StoreOrder::where('uid', 'in', $uids)->where('paid', 1)->whereBetweenTime('add_time', $monthFirstDay, $monthLasttDay)->where('status', '>=', 0)->sum('pay_price');
-                    if ($order_price > 0)
-                    {
-                        $price = $order_price * 0.03;
-                        User::where('uid', $item['uid'])->inc('brokerage_price', $price)->update();
-                        UserBill::income('佣金', $item['uid'], 'now_money', 'brokerage', $price, $item['uid'], $item['brokerage_price']+$price, '区域代理每月提成');
-                    }
-                }elseif ($item['spread_count'] >= 2){
-                    $uids = get_downline(User::select()->toArray(), $item['uid']);
-                    $monthFirstDay = strtotime(date('Y-m-01',time()));
-                    $monthLasttDay = strtotime(date('Y-m-t',time()));
-                    $order_price = StoreOrder::where('uid', 'in', $uids)->where('paid', 1)->whereBetweenTime('add_time', $monthFirstDay, $monthLasttDay)->where('status', '>=', 0)->sum('pay_price');
-                    if ($order_price > 0)
-                    {
-                        $price = $order_price * 0.05;
-                        User::where('uid', $item['uid'])->inc('brokerage_price', $price)->update();
-                        UserBill::income('佣金', $item['uid'], 'now_money', 'brokerage', $price, $item['uid'], $item['brokerage_price']+$price, '区域代理每月提成');
-
-                    }
-                }
-            }
+        try {
+            Db::startTrans();
+            User::bonus();
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
         }
-
     }
 
-    /**
-     * 代理过期
-     * @return void
-     * @throws DataNotFoundException
-     * @throws DbException
-     * @throws ModelNotFoundException
-     */
-    public function overdue()
-    {
-        $user = User::where('identity', 2)->select();
-        foreach ($user as $item)
-        {
-            $time = $item['proxy_time'] + (86400 * 30);
-            if ($time < time()) {
-                $uids = get_downline(User::select()->toArray(), $item['uid']);
-                $order_count = StoreOrder::where('uid', 'in', $uids)->where('paid', 1)->whereBetweenTime('add_time', $item['proxy_time'], time())->where('status', '>=', 0)->count();
-                if ($order_count >= 5)
-                {
-                    User::where('uid', $item['uid'])->update(['proxy_time' => time()]);
-                }else{
-                    User::where('uid', $item['uid'])->update(['identity' => 1]);
-                }
-            }
-        }
-    }
 }

app/common.php

@@ -620,4 +620,19 @@ if (!function_exists('do_request')) {
 
         }
     }
+
+    if (!function_exists('getParent')){
+        //获取指定级别的所有上级
+        function getParent($p_id,$array) {
+            $subs=array();
+            foreach($array as $item){
+                if($item['uid'] == $p_id){
+                    $subs[]=$item['uid'];//这里自己看着办，我是获取用户名
+                    $subs=array_merge($subs,getParent($item['spread_uid'],$array));
+                }
+
+            }
+            return $subs;
+        }
+    }
 }

app/models/store/StoreCart.php

@@ -185,9 +185,9 @@ class StoreCart extends BaseModel
                 $product = StoreProduct::field($productInfoField)
                     ->find($cart['product_id'])->toArray();
             }
-            if ($user['identity'] == 1){
+            if ($user['level'] == 1){
                 $product['price'] = StoreProduct::where('id', $product['id'])->value('vip_repurchase');
-            }elseif ($user['identity'] == 2){
+            }elseif ($user['level'] == 2){
                 $product['price'] = StoreProduct::where('id', $product['id'])->value('agent_repurchase');
             }
             $product['image'] = set_file_url($product['image']);
@@ -236,10 +236,10 @@ class StoreCart extends BaseModel
                     if (!$attrInfo || !$attrInfo['stock'])
                         $invalid[] = $cart;
                     else {
-                        if ($user['identity'] == 1){
-                            $attrInfo['price'] = StoreProduct::where('id', $attrInfo['product_id'])->value('vip_repurchase');
-                        }elseif ($user['identity'] == 2){
-                            $attrInfo['price'] = StoreProduct::where('id', $attrInfo['product_id'])->value('agent_repurchase');
+                        if ($user['level'] == 1){
+                            $attrInfo['price'] = StoreProduct::where('id', $attrInfo['product_id'])->value('vip_repurchase')?? $attrInfo['price'];
+                        }elseif ($user['level'] == 2){
+                            $attrInfo['price'] = StoreProduct::where('id', $attrInfo['product_id'])->value('agent_repurchase') ?? $attrInfo['price'];
                         }
                         $cart['productInfo']['attrInfo'] = $attrInfo;
 

app/models/store/StoreOrder.php

@@ -775,7 +775,7 @@ class StoreOrder extends BaseModel
         StoreOrderStatus::status($oid, 'pay_success', '用户付款成功');
         $now_money = User::where('uid', $order['uid'])->value('now_money');
         UserBill::expend('购买商品', $order['uid'], 'now_money', 'pay_money', $order['pay_price'], $order['id'], $now_money, '支付' . floatval($order['pay_price']) . '元购买商品');
-        $res2 = self::commission($order);
+        self::reward($order, 1);
         //支付成功后
         event('OrderPaySuccess', [$order, $formId]);
         $res = $res1 && $resPink && UserSpread::setSpreadSure($order['uid']) && User::backOrderBrokerage($order);
@@ -783,40 +783,35 @@ class StoreOrder extends BaseModel
     }
 
 
-
-    public static function commission($order)
-    {
-        $spread_uid = User::where('uid', $order['uid'])->value('spread_uid');
-        if ($spread_uid){
-            $user = User::where('uid', $spread_uid)->find();
-            if ($user['identity'] > 0)
-            {
-                $jl = $order['pay_price'] * sys_config('push')/100;
-                User::where('uid', $spread_uid)->inc('brokerage_price', $jl)->update();
-                UserBill::income('佣金', $spread_uid, 'now_money', 'brokerage', $jl, $order['uid'], $user['brokerage_price']+$jl, '用户'.$order['uid'].'购买商品推广佣金');
-            }
-        }
-        $address = explode(' ', $order['user_address']);
-        $city = $address[0].$address[1].$address[2];
-        $address_user = User::where('proxy_area', 'like', '%'.$city.'%')->where('identity', 2)->find();
-        if ($address_user)
-        {
-            //区域代理奖励
-            $address_jl = $order['pay_price'] * sys_config('agent')/100;
-            User::where('uid', $address_user['uid'])->inc('brokerage_price', $address_jl)->update();
-            UserBill::income('佣金', $address_user['uid'], 'now_money', 'brokerage', $address_jl, $order['uid'], $address_user['brokerage_price']+$address_jl, '用户'.$order['uid'].'购买商品区域佣金');
-            if ($address_user['spread_uid']){
-                $vip_user = User::where('uid', $address_user['spread_uid'])->where('identity', 1)->find();
-                if ($vip_user)
-                {
-                    $vip_jl = $order['pay_price'] * sys_config('vip_agent')/100;
-                    User::where('uid', $vip_user['uid'])->inc('brokerage_price' , $vip_jl)->update();
-                    UserBill::income('佣金', $vip_user['uid'], 'now_money', 'brokerage', $vip_jl, $vip_user['uid'], $vip_user['brokerage_price']+$vip_jl, '用户'.$address_user['uid'].'获取区域奖励佣金');
+    public static function reward($order,$type)
+    {
+        $list = StoreOrderCartInfo::where('oid', $order['id'])->select();
+        $user = User::where('uid', $order['uid'])->find();
+        $user1 = User::where('uid', $user['spread_uid'])->find();
+        $user2 = User::where('uid', $user1['spread_uid'])->find();
+        if ($type == 1){
+            $str = '购买';
+            foreach ($list as $item){
+                $product = StoreProduct::where('id', $item['product_id'])->find();
+                $num = $item['cart_info']['cart_num'];
+                $price1 = $product['push'] * $num;// 直推奖励
+                $price3 = $product['Interposition'] * $num;// 间推奖励
+                if ($user1){
+                    User::where('uid', $user['spread_uid'])->inc('brokerage_price', $price1)->update();
+                    $user1['brokerage_price'] += $price1;
+                    UserBill::income('直推奖励', $user1['uid'], 'now_money', 'push', $price1, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id']);
+                }
+                if ($user2){
+                    User::where('uid', $user1['spread_uid'])->inc('brokerage_price', $price3)->update();
+                    $user2['brokerage_price'] += $price3;
+                    UserBill::income('间推奖励', $user2['uid'], 'now_money', 'jt_push', $price3, $user['uid'], $user2['brokerage_price'], '间推用户'.$user['uid'].','.$str.'编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id']);
                 }
             }
+
+
         }
+        return true;
     }
-
     /*
      * 线下支付消息通知
      * 待完善

app/models/system/SystemUserTask.php

@@ -247,6 +247,56 @@ class SystemUserTask extends BaseModel
         return ['还需签到{$num}天', $sumCount, $isComplete];
     }
 
+
+    /**
+     * 直推用户
+     * @param int $task_id 任务id
+     * @param int $uid 用户id
+     * @param int $start_time 查询开始时间
+     * @param int $number 限定数量
+     * @return Boolean
+     * */
+    public static function ValidMembers($task_id, $uid = 0, $start_time = 0, $number = 0)
+    {
+        $isComplete = false;
+        $uids = User::where('spread_uid', $uid)->column('uid');
+        $uidis = [];
+        if (count($uids) > 0){
+            foreach ($uids as $item){
+                $price = StoreOrder::where('uid', $item)->where('paid', 1)->sum('pay_price');
+                if ($price >= 198){
+                    $uidis[] = $item;
+                }
+            }
+        }
+        if (count($uidis) >= $number){
+            $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
+            $count = User::where('level', 1)->count();
+            if ($count < 30){
+                User::where('uid', $uid)->update(['shares' => 2]);
+            }
+        }
+
+        return ['还需签到{$num}天', 1, $isComplete];
+    }
+
+    /**
+     * 直推用户
+     * @param int $task_id 任务id
+     * @param int $uid 用户id
+     * @param int $start_time 查询开始时间
+     * @param int $number 限定数量
+     * @return Boolean
+     * */
+    public static function InviteAgent($task_id, $uid = 0, $start_time = 0, $number = 0)
+    {
+        $isComplete = false;
+        $uids = get_downline(User::select(), $uid);
+        $user_count = User::where('uid', 'in', $uids)->where('level', 1)->count();
+        if ($user_count >= $number)$isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
+        return ['还需签到{$num}天', 1, $isComplete];
+    }
+
     /**
      * 设置任务完成情况
      * @param int $task_id 任务id

app/models/user/User.php

@@ -736,4 +736,102 @@ class User extends BaseModel
         }
         return $model->where('brokerage_price', '>', $brokerage_price)->count('uid');
     }
+
+
+    /**
+     * 团队奖励分红
+     * @return void
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public static function bonus()
+    {
+
+        $user = User::select();
+        foreach ($user as $item)
+        {
+            $price = StoreOrder::whereBetweenTime('add_time', strtotime('yesterday'), strtotime('tomorrow'))->where('paid', 1)->where('uid', $item['uid'])->sum('pay_price');// 月结
+            if ($item['spread_uid'] > 0 and $price > 0){
+                $spread = getParent($item['spread_uid'], $user->toArray());// 找到所有上级
+                $v1 = 0;
+                $v2 = 0;
+                $v3 = 0;
+                $one = sys_config('vip_agent')/100; // 代理
+                $tow = sys_config('agent')/100; // 分公司
+                $three = sys_config('total')/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 ($v1 == 0) { // 没有发放v1的奖励
+                                    $jl = $price * $one;
+                                    $v1++;
+                                }
+                            }
+                        }elseif ($details['level'] == 2){
+                            if ($v3 == 0){
+                                // 没有发放合伙人的奖励
+                                if ($v1 == 0 and $v2 == 0) { // 没有发放区代和市代的奖励的奖励
+                                    $jl = $price * $tow;// 市代团队奖励
+                                    $v2++;
+                                }elseif ($v1 > 0 and $v2 == 0){// 发放区代奖励，没有发放市代的奖励
+                                    $jl = $price * ($tow - $one); // 市代团队奖励
+                                    $v2++;
+                                }
+
+                            }
+
+                        }elseif ($details['level'] == 3){
+                            if ($v1 == 0 and $v2 == 0 and $v3 == 0) { // 没有发放区代和市代，合伙人的奖励的奖励
+                                $jl = $price * $three;  // 合伙人团队奖励
+                                $v3++;
+                            }elseif ($v1 > 0 and $v2 == 0 and $v3 == 0){// 发放区代奖励，没有发放市代，合伙人的奖励
+                                $jl = $price * ($three - $one);  // 合伙人团队奖励
+                                $v3++;
+                            }elseif ($v1 == 0 and $v2 > 0 and $v3 == 0){// 没有发放区代奖励，发放市代的奖励,没有发放合伙人的奖励
+                                $jl = ($price * ($three - $tow));  // 合伙人团队奖励
+                                $v3++;
+                            }elseif ($v1 > 0 and $v2 > 0 and $v3 == 0){// 发放区代奖励，发放市代的奖励,发放合伙人的奖励
+                                $jl = ($price * ($three - $tow));  // 合伙人团队奖励
+                                $v3++;
+                            }
+                        }
+                        if ($jl > 0){
+                            $brokerage_price = $jl;// 到账佣金
+                            if ($details['level'] == 3) {
+                                $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 ($v1 > 0) $bl -= $one;
+                            }
+                            if ($details['level'] == 1) $bl =  $one;
+                            if ($details['level'] == 3){
+                                $pf =  $brokerage_price * 0.02;
+                                $uids = User::where('level','>=', 1)->where('shares', '>', 0)->column('uid');
+                                $pf = $pf/count($uids);
+                                foreach ($uids as  $a){
+                                    $shares = User::where('uid', $a)->find();
+                                    User::where('uid', $a)->inc('brokerage_price', $pf)->update();
+                                    UserBill::income('股份分红', $a, 'now_money', 'shares', $pf, $item['uid'],$shares['brokerage_price'] + $pf, '股份分红');
+                                }
+
+                            }
+                            User::where('uid', $value)->inc('brokerage_price', $brokerage_price)->update();
+                            UserBill::income('团队分红', $details['uid'], 'now_money', 'team', $brokerage_price, $item['uid'],$details['brokerage_price'] + $brokerage_price, '用户'.$item['uid'].'日结'.$price.'团队奖励比例'.$bl.'的佣金');
+                        }
+                        $jl = 0;
+                    }
+
+                }
+            }
+        }
+    }
 }

app/models/user/UserBill.php

@@ -65,7 +65,7 @@ class UserBill extends BaseModel
             if ($page) {
                 $list = self::where('uid', $uid)
                     ->where('category', 'now_money')
-                    ->where('type', 'in','brokerage')
+                    ->where('type', 'in','brokerage,shares,team,push,jt_push,extract')
                     ->field('mark,pm,number,add_time')
                     ->where('status', 1)
                     ->where($where)
@@ -83,7 +83,7 @@ class UserBill extends BaseModel
                     ->select();
             }
             $data['zc'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', 'extract')->where('pm', 0)->sum('number');
-            $data['sr'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', 'brokerage')->where('pm', 1)->sum('number');
+            $data['sr'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', 'in','brokerage,shares,team,push,jt_push')->where('pm', 1)->sum('number');
             $data['list'] = count($list) ? $list->toArray() : [];
             foreach ($data['list'] as &$v) {
                 $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
@@ -94,7 +94,7 @@ class UserBill extends BaseModel
             if ($page) {
                 $list = self::where('uid', $uid)
                     ->where('category', $category)
-                    ->where('type', 'notIn', 'brokerage,extract')
+                    ->where('type', 'notIn', 'brokerage,shares,team,push,jt_push,extract')
                     ->field('mark,pm,number,add_time')
                     ->where('status', 1)
                     ->where($where)
@@ -112,7 +112,7 @@ class UserBill extends BaseModel
                     ->select();
             }
             $data['zc'] = self::where('uid', $uid)->where('category', $category)->where('type', 'notIn', 'extract')->where('pm', 0)->sum('number');
-            $data['sr'] = self::where('uid', $uid)->where('category', $category)->where('type', 'notIn', 'brokerage')->where('pm', 1)->sum('number');
+            $data['sr'] = self::where('uid', $uid)->where('category', $category)->where('type', 'notIn', 'brokerage,shares,team,push,jt_push')->where('pm', 1)->sum('number');
             $data['list'] = count($list) ? $list->toArray() : [];
             foreach ($data['list'] as &$v) {
                 $v['add_time'] = date('Y/m/d H:i', $v['add_time']);

route/api/route.php

@@ -239,8 +239,6 @@ Route::group(function () {
 
     Route::get('bonus', 'user.UserController/bonus')->name('bonus');
 
-    Route::get('overdue', 'user.UserController/overdue')->name('overdue');
-
 
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, false);