修改分红和团队显示

app/controller/api/Notify.php

@@ -278,7 +278,7 @@ class Notify
                                             }
 
                                             //贡献值
-                                            $this->con_log($spread_data['uid'],$ssf,$store_order_data['order_id'],11,"精彩生活区商品赠送贡献值");
+                                            $this->con_log($spread_data['uid'],$pv,$store_order_data['order_id'],11,"精彩生活区商品赠送贡献值");
                                             //积分
                                             $this->score_log($spread_data['uid'],$ssf,$store_order_data['order_id'],11,"精彩生活区商品赠送积分");
                                             // //推广佣金

app/controller/api/store/merchant/Taskorder.php

@@ -801,6 +801,12 @@ class Taskorder extends BaseController
                 $user_pv_small_num = $this->getpersamllcomm($v);//返回是数组，下标0是最小的值(业绩小的)，下标1是最大的值(业绩大的)
                 $my_mix_money = round($amont * ($user_pv_small_num[0]/$small_ow_bill),2);
 
+                $userdatassss = db::name("old_user_jbp")->where("id",$v)->find();
+                $datas_log = [
+                    'note'=>"名称:".  $userdatassss['nick_name']  ." 用户:". $v . " 双联盟总业绩:" . $owner_bill ." 我的双区业绩:". $my_bill . " 小区总业绩:".$small_ow_bill." 我的小区业绩:" . $user_pv_small_num[0] . "  可分红佣金:" .$amont . "  可分红总佣金:" . $fs_money_nums . "  小区业绩可分红:" . $my_mix_money . " 大区业绩可分红:" .$my_weight_money,
+                    'create_time'=>date('Y-m-d H:i:s')
+                ];
+                $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
 // var_dump("当前级别合伙人双联盟总业绩:" . $owner_bill);
 // var_dump("当前级别合伙人小区总业绩:".$small_ow_bill);
 // var_dump("当前级别合伙人可分红佣金:" .$amont);
@@ -842,11 +848,10 @@ class Taskorder extends BaseController
                 $week_data['my_bill'] = $my_bill;  //我的流水
                 $week_data['create_time'] = time();
 
-
                 Db::name("old_user_weekaward")->insert($week_data);
 
 
-                $this->bill_user_log111111($v,"合伙人分佣",$all_award,"合伙人分佣明细入账");//联创分佣明细2.0系统
+                // $this->bill_user_log111111($v,"合伙人分佣",$all_award,"合伙人分佣明细入账");//联创分佣明细2.0系统
 
                 //}
             }

app/controller/api/store/order/StoreOrder.php

@@ -514,18 +514,28 @@ class StoreOrder extends BaseController
                 }
                 //return app('json')->fail(123);
                 //检查在旧表中是否有上级
-                if($userdatas['spread_old'] != 0){
-                    $sf = Db::name('old_user_jbp')->where('id',$userdatas['spread_old'])->find();
-                    if(!empty($sf)){
+                if($userdatas['spread_uid'] != 0){
+
+                    return app('json')->fail($userdatas['spread_old']);
+                    //查询当前用户的上级在1.0中是有数据的，那么老用户介绍新用户。
+                    $sf = Db::name('old_user_jbp')->where('id',$userdatas['spread_uid'])->find();//父级在旧表有注册
+
+                    $sf1 = Db::name('old_user_jbp')->where('id',$userdatas['id'])->find();
+
+                    // 当前用户是在2.0注册的新用户，父级是在1.0
+
+                    //当前用户在1.0中没有注册，但是父级在1.0系统中注册过。
+                    if(!empty($sf1)){
+
                         //检查用户在旧表中是否与上级，有的话就是升级权限，要新增一个user_of_goods的表
                         $data1['user_id']=$uid;
                         $data1['goods_list_id']=0;
                         $data1['status']=0;
-                        $data1['spread_id']=$userdatas['invite_id_od'];
-                        $data1['node_id']=$userdatas['spread_old'];
+                        $data1['spread_id']=$sf1['invite_id'];
+                        $data1['node_id']=$sf1['spread'];
                         $data1['money']= $array_fzone_paytype['price'];
                         $data1['order_id']=10;
-                        $data1['server_id']=$userdatas['server_id_old'];
+                        $data1['server_id']=$userdatas['server_id'];
                         $data1['pay_gb']=0;
                         $data1['pay_vr']= $array_fzone_paytype['price'];
                         $data1['pay_bt']=0;
@@ -534,14 +544,12 @@ class StoreOrder extends BaseController
 
                         $sfe=  Db::name('old_user_of_goods')->insertGetId($data1);
 
-
-
                         if($sfe){
                             $getuserofgoodsid = $sfe;
                         }
-
                     }
 
+
                 }
 
 

app/controller/api/user/User.php

@@ -1361,7 +1361,7 @@ class User extends BaseController
 
 
         //$teamid =  $this->request->param('teamid');//测试ID
-        //$teamid = 17;
+        $teamid = 17;
 
         $datas_jbp = Db::name('old_user_jbp')->where("id",$teamid)->find();//查询旧系统是否有当前会员
         $type = $this->request->param('type',0);//1：大部门，0：小部门,2:直推
@@ -1440,20 +1440,20 @@ class User extends BaseController
 // 查询当前会员旗下的会员数据（分页）
         [$page, $limit] = $this->getPage();
         $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')
+            // ->alias('u')
+            // ->join('store_order so', 'u.uid = so.uid', 'LEFT')
+            ->where("spread_uid", $teamid)
+            // ->where("so.mer_id", 496)
+            // ->group('u.uid')
             ->page($page, $limit)
             ->select();
 
         $total_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')
+            // ->alias('u')
+            // ->join('store_order so', 'u.uid = so.uid', 'LEFT')
+            ->where("spread_uid", $teamid)
+            // ->where("so.mer_id", 496)
+            // ->group('u.uid')
             ->count();
 
         $data1 = [
@@ -2605,6 +2605,8 @@ class User extends BaseController
         $today_signintime = strtotime(date('Y-m-d', time()));
         $today_signin_info = Db::name('user_sign_score')->where(array('uid' => $uid))->whereDay('signin_time')->find();
 
+        return app('json')->fail('今天已经签到过了xx');
+
         if (!empty($today_signin_info)) {
             return app('json')->fail('今天已经签到过了');
         } else {
@@ -2632,7 +2634,7 @@ class User extends BaseController
             $userRepository->sign_add($uid, $get_score, 1, '签到赠送积分', $has_qian, $today_signintime, '', 1, '', 1);
             if($get_gw_score > 0){
                 $userRepository->sign_add($uid, $get_gw_score,1,'连续签到赠送额外奖励积分', $has_qian, $today_signintime, '', 1, '', 1);
-            }   
+            }
 
 
             //首次签到