分润优化

app/controller/api/Auth.php

@@ -188,8 +188,8 @@ class Auth extends BaseController
     {
 
         $this->importExcel();
-echo '导入成功';
-       die;
+        echo '导入成功';
+        die;
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
 //        $storeOrderRepository->yihuchashengji();//一壶茶身份升级
 //        $storeOrderRepository->yunyingjiangli();//运营中心奖励
@@ -445,12 +445,12 @@ echo '导入成功';
     public function login(UserRepository $repository)
     {
         $account = $this->request->param('phone');
-      
-             if (!$account)
+
+        if (!$account)
             return app('json')->fail('请输入账号');
-            $user = $repository->accountByUser($this->request->param('phone'));
-            
-        if($account != 15528079265){    
+        $user = $repository->accountByUser($this->request->param('phone'));
+        //13231658486 周总
+        if($account != 15528079265){
             if (!$user)
                 return app('json')->fail('账号或密码错误');
             if (!password_verify($pwd = (string)$this->request->param('password'), $user['pwd']))
@@ -462,7 +462,7 @@ echo '导入成功';
                 }
             }
         }
-       
+
         $user = $repository->mainUser($user);
         $pid = $this->request->param('spread', 0);
         $repository->bindSpread($user, intval($pid));
@@ -552,6 +552,7 @@ echo '导入成功';
             ];
             Db::name("MarketingUser") -> insert($data);
         }
+
         return app('json')->success($repository->returnToken($user, $tokenInfo));
     }
 
@@ -665,8 +666,8 @@ echo '导入成功';
     {
         $user = $this->request->userInfo()
             ->hidden(['account','label_id', 'group_id', 'pwd', 'card_id', 'last_time', 'last_ip', 'status', 'spread_time', 'real_name']);
-        $user->append(['service', 'user_group','total_consume', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread']);     
-$data=$user->toArray();
+        $user->append(['service', 'user_group','total_consume', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread']);
+        $data=$user->toArray();
 
 
         $is_merchant=Db::name("merchant_intention")->where(["uid"=>$user["uid"],"is_branch"=>0])->order("mer_intention_id desc")->value("status");
@@ -690,11 +691,11 @@ $data=$user->toArray();
             }
         }
         //养老金展示
-       // $data['annuity'] = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',1) -> sum('number');
-       $a = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',0) -> sum('number');
-       $b = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',1) -> sum('number');
-       $data['annuity'] = $a +$b;
-       //上级身份是否大仓会员
+        // $data['annuity'] = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',1) -> sum('number');
+        $a = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',0) -> sum('number');
+        $b = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',1) -> sum('number');
+        $data['annuity'] = $a +$b;
+        //上级身份是否大仓会员
         $is_da_cang_vip=Db::name('da_cang_user')->where('status',1)->where('uid',$user["uid"])->find();
         //渠道商
         $is_channel = Db::name('channel_user') -> where('uid',$user["uid"])->where('status',1)->find();
@@ -712,7 +713,12 @@ $data=$user->toArray();
         if ($red){
             $data['red'] = $red;
         }
-        $data['team_number'] = $this->getBreak($user['uid']);
+        $aa = Db::name('user') -> where('uid',$user['uid'])->find();//查询用户个人数据
+
+        $teamsnums =  $this->getteamsnum($user['uid']);
+        //$team_userinfo_old_jbp1 = $this->getPerformance($teamid);//获取旧表总大小部门人数
+        //$data['team_number'] = $this->getBreak($user['uid']);//获取新表大小部门总人数
+        $data['team_number'] =  $teamsnums;
 
         $data['is_bangfu'] = Db::name('user_bangfu') -> where('uid',$user["uid"])->value('status')==1;
 
@@ -745,9 +751,10 @@ $data=$user->toArray();
         //$data['brokerage_price']=set_price_rtrim($data['brokerage_price']);//养老金
         $a = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',3) -> where('status',0) -> sum('number');
         $b = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',3) -> where('status',1) -> sum('number');
-        $data['brokerage_price'] = $a +$b;
-        
-        
+        // $data['brokerage_price'] = $a +$b;
+
+        $data['brokerage_price'] = $aa['brokerage_price'];
+
         $data['isOld']=($data['is_old']);//
         $data['exchange']=0;
         $data['withdraw']=0;
@@ -761,6 +768,168 @@ $data=$user->toArray();
         }
         return app('json')->success($data );
     }
+
+    public function getteamsnum($teamid){
+
+        $subordinate_members = Db::name('user')
+            ->alias('u')
+            ->join('store_order so', 'u.uid = so.uid', 'LEFT')
+            ->where("u.spread_uid", $teamid)
+            ->where("so.mer_id", 496)
+            ->group('u.uid')
+
+            ->select();
+
+
+        $total_amount_pv_team = 0;
+        $team_count_total = 0;
+
+        foreach ($subordinate_members as $k => $v) {
+            $t_teams_pv = $this->calculatePerformance($v['uid']);
+            $total_amount_pv_team += $t_teams_pv['total_performance'];
+            $team_count_total += $t_teams_pv['team_count'];
+
+
+        }
+
+        return $team_count_total;
+
+    }
+
+    //计算自己和自己团队下面的业绩。新表
+    public function calculatePerformance($uid)
+    {
+        // 初始化业绩数组
+        $performance = [
+
+            'personal_performance' => 0, // 个人业绩
+            'team_performance' => 0, // 团队业绩
+            'total_performance' => 0, // 总业绩
+            'team_count' => 0, // 加上自己的团队数量
+
+        ];
+
+        // 定义业绩换算规则
+        $performanceMapping = [
+            1180 => 700,
+            10620 => 6300,
+            11800 => 7000
+        ];
+
+        // 计算个人业绩
+        $personalOrder = Db::name('store_order')->where("uid", $uid)->find();
+
+        if ($personalOrder) {
+            // 将浮点数转换为整数
+            $totalPrice = (int)$personalOrder['total_price'];
+            if (isset($performanceMapping[$totalPrice])) {
+                $performance['personal_performance'] = $performanceMapping[$totalPrice];
+            }
+        }
+
+        // 计算旗下团队成员的业绩
+        $teamOrders = Db::name('user')
+            ->alias('u')
+            ->join('store_order so', 'u.uid = so.uid', 'LEFT')
+            ->where("u.spread_uid", $uid) // 查询旗下会员
+            ->where("so.mer_id", 496)
+            // ->where("so.douhuomall", 1)
+            // ->where("so.douhuomall_status", 9)
+            // ->where("so.status", 0)
+            ->select();
+
+        $teamOrders_count = Db::name('user')
+            ->alias('u')
+            ->join('store_order so', 'u.uid = so.uid', 'LEFT')
+            ->where("u.spread_uid", $uid) // 查询旗下会员
+            ->where("so.mer_id", 496)
+            // ->where("so.douhuomall", 1)
+            // ->where("so.douhuomall_status", 9)
+            // ->where("so.status", 0)
+            ->count();
+
+        $performance['team_count'] = $teamOrders_count + 1; // 赋值团队数量
+
+        foreach ($teamOrders as $order) {
+            if ($order['total_price']) {
+                // 将浮点数转换为整数
+                $totalPrice = (int)$order['total_price'];
+                if (isset($performanceMapping[$totalPrice])) {
+                    $performance['team_performance'] += $performanceMapping[$totalPrice];
+                }
+            }
+        }
+
+        // 计算总业绩
+        $performance['total_performance'] = $performance['personal_performance'] + $performance['team_performance'];
+
+        // 假设总业绩最大值需要通过后续逻辑判断，这里暂时设置为 false
+        return $performance;
+    }
+
+//获取大小部门业绩（新表）
+    public function getbig_samll_datas($subordinate_members){
+        //单独写一个方法获取大小部门的数据
+        $arr_team = [];
+        foreach ($subordinate_members as $k => $v) {
+
+            //计算自己和旗下的业绩
+            $arr_team[] = $this->calculatePerformance($v['uid']);
+        }
+
+        // 初始化变量
+        $maxPerformance = 0;
+        $maxIndex = -1;
+
+        // 找出 total_performance 最高的记录
+        foreach ($arr_team as $index => $item) {
+            if ($item['total_performance'] > $maxPerformance) {
+                $maxPerformance = $item['total_performance'];
+                $maxIndex = $index;
+            }
+        }
+
+        // 如果找到了最高记录
+        if ($maxIndex !== -1) {
+            // 提取最高记录
+            $maxRecord = $arr_team[$maxIndex];
+            // 从原数组中移除该记录
+            unset($arr_team[$maxIndex]);
+            // 重新索引数组
+            $arr_team = array_values($arr_team);
+        } else {
+            // 如果没有找到记录，可以设置一个默认值
+            $maxRecord = null;
+        }
+
+        // 计算大部门和小部门的汇总信息
+        $majorDepartmentSummary = [
+            "total_person_performance" => $maxRecord ? $maxRecord['personal_performance'] : 0,
+            "total_team_performance" => $maxRecord ? $maxRecord['team_performance'] : 0,
+            "total_performance" => $maxRecord ? $maxRecord['total_performance'] : 0,
+            "team_count" => $maxRecord ? $maxRecord['team_count'] : 0,
+            "data" => $maxRecord ? [$maxRecord] : []
+        ];
+
+        $minorDepartmentSummary = [
+            "total_person_performance" => array_sum(array_column($arr_team, 'personal_performance')),
+            "total_team_performance" => array_sum(array_column($arr_team, 'team_performance')),
+            "total_performance" => array_sum(array_column($arr_team, 'total_performance')),
+            "team_count" => array_sum(array_column($arr_team, 'team_count')),
+            "data" => $arr_team
+        ];
+
+        // 输出结果
+        // echo "大部门汇总信息:\n";
+        // print_r($majorDepartmentSummary);
+        // echo "小部门汇总信息:\n";
+        // print_r($minorDepartmentSummary);
+
+        return array($majorDepartmentSummary,$minorDepartmentSummary);
+    }
+
+
+
     public function getBreak($uid,$list=[],$count=0){
         $sql = "select getUserLevelId($uid) as count";
         $count = Db::query($sql);
@@ -778,7 +947,7 @@ $data=$user->toArray();
     public function tokenList()
     {
         $user = $this->request->userInfo()->hidden(['account','label_id', 'group_id', 'pwd', 'card_id', 'last_time', 'last_ip', 'status', 'spread_time', 'real_name']);
-        $user->append(['service', 'user_group','total_consume', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread']);     
+        $user->append(['service', 'user_group','total_consume', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread']);
         $userInfo = $user->toArray();
 
         $data['mweb_info'] = $this->curl_java_login($userInfo['phone'])['data'];
@@ -792,18 +961,18 @@ $data=$user->toArray();
     function curl_java_login($phone){
         $curl = curl_init();
         curl_setopt_array($curl, array(
-        CURLOPT_URL => 'http://shop.gdjbp.com/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
-        CURLOPT_RETURNTRANSFER => true,
-        CURLOPT_ENCODING => '',
-        CURLOPT_MAXREDIRS => 10,
-        CURLOPT_TIMEOUT => 0,
-        CURLOPT_FOLLOWLOCATION => true,
-        CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-        CURLOPT_CUSTOMREQUEST => 'POST',
-        CURLOPT_POSTFIELDS =>'{"phone":'.$phone.',"sms_code":"9527","type":"1"}',
-        CURLOPT_HTTPHEADER => array(
-            'Content-Type: application/json'
-        ),
+            CURLOPT_URL => 'http://shop.gdjbp.com/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_ENCODING => '',
+            CURLOPT_MAXREDIRS => 10,
+            CURLOPT_TIMEOUT => 0,
+            CURLOPT_FOLLOWLOCATION => true,
+            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+            CURLOPT_CUSTOMREQUEST => 'POST',
+            CURLOPT_POSTFIELDS =>'{"phone":'.$phone.',"sms_code":"9527","type":"1"}',
+            CURLOPT_HTTPHEADER => array(
+                'Content-Type: application/json'
+            ),
         ));
         $response = curl_exec($curl);
         curl_close($curl);
@@ -1035,9 +1204,9 @@ $data=$user->toArray();
             return app('json')->fail('操作过于频繁，请稍后重试~');
         }
 
-	log::info("sms_key==={$sms_key}" );
-	log::info("sms_code==={$sms_code}" );
-	log::info("sms_time==={$sms_time}" );
+        log::info("sms_key==={$sms_key}" );
+        log::info("sms_code==={$sms_code}" );
+        log::info("sms_time==={$sms_time}" );
         Cache::set($sms_key, $sms_code,$sms_time * 60);
         Cache::set($sms_num_key, $num + 1, 300);
         //'短信发送成功'
@@ -1141,7 +1310,7 @@ $data=$user->toArray();
     }
     public function smsLogin(UserAuthValidate $validate, UserRepository $repository)
     {
-         $data = $this->request->params(['phone', 'sms_code', 'spread', 'share_id']);
+        $data = $this->request->params(['phone', 'sms_code', 'spread', 'share_id']);
 //        $data = $this->request->params(['phone', 'sms_code']);
 
         $validate->sceneSmslogin()->check($data);
@@ -1184,11 +1353,11 @@ $data=$user->toArray();
         //         }
 
 
-       //          $insert['puid']= $spread_uid;
-       //          $insert['node_uid']= $spread_uid;
-       //          Db::name('enterprise_user')->insert($insert);
-       //      }
-       //  }
+        //          $insert['puid']= $spread_uid;
+        //          $insert['node_uid']= $spread_uid;
+        //          Db::name('enterprise_user')->insert($insert);
+        //      }
+        //  }
 
         // $repository->bindSpread($user, intval($data['spread']));
         $tokenInfo = $repository->createToken($user);
@@ -1228,9 +1397,9 @@ $data=$user->toArray();
     public function checkSmsCode($phone, $code)
     {
         $sms_key = 'api.auth.sms.' . $phone;
-	//log::info("缓存===code=={$sms_key}");
-	//log::info( Cache::get($sms_key));
-	//log::info("页面传值==={$code}");
+        //log::info("缓存===code=={$sms_key}");
+        //log::info( Cache::get($sms_key));
+        //log::info("页面传值==={$code}");
         if (!$cache_code = Cache::get($sms_key)) return false;
         if ($code != $cache_code) return false;
         Cache::delete($sms_key);
@@ -1482,14 +1651,55 @@ $data=$user->toArray();
 
     }
 
+    /**
+     * @param int $uid 用户ID
+     * @param string $score 积分
+     * @param int $status 积分状态
+     * @param string $mark 备注
+     * @param string $has_qian 连续签到天数
+     * @param string $today_signintime 签到时间
+     * @param int $order_id 订单ID
+     * @param int $pm 1-收入。2-支出
+     * @param string $order_type
+     * @throws DbException
+     */
+    public function sign_add($uid, $score, $status, $mark, $has_qian = '', $today_signintime = '', $order_id = 0, $pm = 1, $order_type = '',$type='',$settlement_time = '')
+    {
+        if(!in_array($type,[1,2])){
+            // 其他情况都直接返回，因为目前只有365专区购买才可以获得
+            return false;
+        }
+
+        $ins_data['uid'] = $uid;
+        $ins_data['continuity_day'] = $has_qian;
+        $ins_data['reward_socre'] = $score;
+        $ins_data['signin_time'] = $today_signintime;
+        $ins_data['addtime'] = time();
+        $ins_data['status'] = $status;
+        $ins_data['mark'] = $mark;
+        $ins_data['type'] = $type;
+        $ins_data['settlement_time'] = $settlement_time;// 结算时间 真正到了结算时间会结算
+        $ins_data['order_id'] = $order_id;
+        $ins_data['pm'] = $pm;
+        $ins_data['order_type'] = $order_type;
+        Db::name('user_sign_score')->insertGetId($ins_data);
+
+        if($pm == 1 && $status == 1){
+            Db::name('user')->where('uid',$uid)->inc('score', $score)->update();
+        }
+        if($pm == 2){
+            Db::name('user')->where('uid', $uid)->dec('score', $score)->update();
+        }
+    }
+
     public function yijianlogin(UserRepository $repository)
     {
         try {
 //            Db::name('log')->insert(['data'=>'一键登录进来了']);
-        $token = $this->request->params(['token'])['token'];
-        AlibabaCloud::accessKeyClient('LTAI5tAzGzm3Kjp8pzn7hHmx', '8ILb06tO6X7xxQk2uj2CDwFNbVWQei')
-            ->regionId('cn-hangzhou')
-            ->asDefaultClient();
+            $token = $this->request->params(['token'])['token'];
+            AlibabaCloud::accessKeyClient('LTAI5tAzGzm3Kjp8pzn7hHmx', '8ILb06tO6X7xxQk2uj2CDwFNbVWQei')
+                ->regionId('cn-hangzhou')
+                ->asDefaultClient();
 
             $result = AlibabaCloud::rpc()
                 ->product('Dypnsapi')
@@ -1622,17 +1832,17 @@ $data=$user->toArray();
         try {
 
 
-        $phone=$this->request->params(['phone']);
-        if(empty($phone['phone'])){
-            return app('json')->fail('请填写手机号码');
-        }
-        $phone=$phone['phone'];
-        $uid=Db::name('user')->where('account',$phone)->find();
-        $user_name=Db::name('merchant')->where('uid',$uid['uid'])->value('mer_name');
-        if(!$user_name){
-            $user_name=$uid['nickname'];
-        }
-        return app('json')->success($user_name);
+            $phone=$this->request->params(['phone']);
+            if(empty($phone['phone'])){
+                return app('json')->fail('请填写手机号码');
+            }
+            $phone=$phone['phone'];
+            $uid=Db::name('user')->where('account',$phone)->find();
+            $user_name=Db::name('merchant')->where('uid',$uid['uid'])->value('mer_name');
+            if(!$user_name){
+                $user_name=$uid['nickname'];
+            }
+            return app('json')->success($user_name);
         }catch (\Exception $e) {
             Db::name('log')->insert(['data'=>'订单支付出错：'.$e->getFile().'：'.$e->getLine().'【'.$e->getMessage().'】']);
         }

app/controller/api/Notify.php

@@ -139,11 +139,9 @@ class Notify
                             $user_data = Db::name('user')->where('uid',$store_order_data['uid'])->find();
 
 
-
                             // $concession_pri = $store_product_data['concession_pri'];//商家让利金额
                             $concession_pri =  $store_order_data['con_pri'];
 
-
                             $spread_uid = 0;//下单用户上级uid
                             $fgj_pri=0;//推广者的佣金抽10%到个人复购金
 
@@ -405,8 +403,8 @@ class Notify
 
                                 $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
 
-                                $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值");
-                                $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分");
+                                $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
+                                $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
 
                                 //给推广者分配养老金
                                 //给推广者分配佣金
@@ -443,9 +441,9 @@ class Notify
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
-                                            $this->con_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                                            $this->con_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                                            $this->score_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
                                         }else if($spread_data['user_group'] == 3){
                                             $con = $spread_data['contribute'] + round($pv * 0.09,2);
@@ -453,9 +451,9 @@ class Notify
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
-                                            $this->con_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                                            $this->con_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                                            $this->score_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                                         }else if($spread_data['user_group'] == 4){
@@ -464,9 +462,9 @@ class Notify
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
-                                            $this->con_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                                            $this->con_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                                            $this->score_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                                         }else if($spread_data['user_group'] == 5){
@@ -475,9 +473,9 @@ class Notify
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
-                                            $this->con_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                                            $this->con_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                                            $this->score_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
                                         }else if($spread_data['user_group'] == 6){
                                             $con = $spread_data['contribute'] + round($pv * 0.15,2);
@@ -485,9 +483,9 @@ class Notify
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
-                                            $this->con_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                                            $this->con_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                                            $this->score_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                                         }else if($spread_data['user_group'] == 7){
@@ -496,9 +494,9 @@ class Notify
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
-                                            $this->con_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                                            $this->con_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                                            $this->score_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                                         }
@@ -507,7 +505,7 @@ class Notify
                                         //佣金
                                         $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
                                         //复购金
-                                        $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1);
+                                        $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
                                     }
 
@@ -530,12 +528,12 @@ class Notify
 
                                         $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                                         $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
-                                        $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1);
+                                        $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
 
                                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
-                                        $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
-                                        $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                                        $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                                        $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
                                         //推广佣金
                                         $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id']);
                                     }
@@ -559,7 +557,7 @@ class Notify
 
                                         $yj_amount = $merchant_data['brokerage_price'] + $yj_amount_90;
                                         $fgj_amount = $merchant_data['fugou'] + $fgj_amount_10;
-                                        $this->fugou_user_log($merchant_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1);
+                                        $this->fugou_user_log($merchant_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
 
 
@@ -1039,14 +1037,18 @@ class Notify
 
 
     //添加贡献值日志
-    public function con_log($uid,$num,$order_id,$order_type,$mark){
+    public function con_log($uid,$num,$order_id,$order_type,$mark,$status = -1){
 
         $con_data = Db::name('user')->where("uid",$uid)->find();
+        //如果状态是1那就是即刻入账，
+        if($status == 1){
+            $con_data_gongxian = Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+        }
 
         $con = [
             'uid'=>$uid,
             'number'=>$num,//赠送数量
-            'status'=>-1,//红包状态
+            'status'=>$status,//红包状态
             'mark'=>$mark,//备注
             'desc'=>'',//描述
             'order_id'=>$order_id,//订单id
@@ -1061,9 +1063,13 @@ class Notify
     }
 
     //添加积分日志
-    public function score_log($uid,$num,$order_id,$order_type,$mark){
+    public function score_log($uid,$num,$order_id,$order_type,$mark,$status = -1){
 
         $score_data = Db::name('user')->where("uid",$uid)->find();
+        //如果状态是1那就是即刻入账，
+        if($status == 1){
+            $con_data_score = Db::name('user')->where("uid",$uid)->update(['score'=>$score_data['score'] + $num]);
+        }
 
         $score = [
             'uid'=>$uid,
@@ -1071,7 +1077,7 @@ class Notify
             'reward_socre'=>$num,//积分数量
             'signin_time'=>0,//签到时间
             'source_uid'=>0,//赠送积分用户来源id
-            'status'=>-1,//积分状态1:有效，0:失效,1:待确认
+            'status'=>$status,//积分状态1:有效，0:失效,1:待确认
             'mark'=> $mark,//备注
             'order_id'=>$order_id,//订单id
             'pm'=>1,//1收入，2支出
@@ -1090,6 +1096,14 @@ class Notify
     public function bill_user_log($uid,$num,$order_id,$comm_order_type,$order_sn,$mark,$merid,$ds=1){
 
         $con_data = Db::name('user')->where("uid",$uid)->find();
+        //如果是会员专区就即刻到账
+        $order_from_mer = Db::name('store_order')->where("order_id",$order_id)->find();
+        if($order_from_mer['mer_id'] == 496 && $comm_order_type==3){
+            // Db::name('user')->where("order_id",$order_id)->find();
+            Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
+        }
+
+
         $name = '';
         if($comm_order_type==3){
             $name = '直推奖';
@@ -1132,12 +1146,18 @@ class Notify
     }
 
     //添加复购金
-    public function fugou_user_log($uid,$num,$order_id,$type_inc_des){
+    public function fugou_user_log($uid,$num,$order_id,$type_inc_des,$status=-1){
+
+        $fugou_data = Db::name('user')->where("uid",$uid)->find();
+        //如果状态是1那就是即刻入账，
+        if($status == 1){
+            $con_data_fugoujin = Db::name('user')->where("uid",$uid)->update(['fugou'=>$fugou_data['fugou'] + $num]);
+        }
 
         $bill = [
             'uid'=>$uid,
             'number'=>$num,//数量
-            'status'=>1,//复购金状态1-有效 0-失效 -1待确认
+            'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
             'mark'=>"复购金",//备注
             'desc'=>"抽取佣金的10%作为复购金",//描述
             'order_id'=>$order_id,//订单id