Merge branch 'master' into huangfamily

app/common/repositories/store/order/StoreOrderRepository.php

@@ -9250,6 +9250,10 @@ class StoreOrderRepository extends BaseRepository
                     Db::name('user')->where("uid", $uid)->update(['per_contribute' => $con_data['per_contribute'] + $num]);
                 }
 
+                if($pv > 0){
+                    Db::name('user')->where("uid", $uid)->update(['pv' => $con_data['pv'] + $pv]);
+                }
+
                 //if(count($spread_data) > 0){
                 // $all_ids = [];
                 // foreach($spread_data as $k=>$v){
@@ -9774,7 +9778,7 @@ class StoreOrderRepository extends BaseRepository
             // Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,'contribute'=> $gxz_amount_mine,'score'=> $jf_amount_mine]);
 
             $this->bill_user_log($user_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . bcmul($pv, 0.035, 2), $store_order_data['mer_id']);
-            $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1, $pv);
+            $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1, $gx_jf);
             $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
 
             //查询下单用户上级身份（2.0新表用户）
@@ -9792,10 +9796,15 @@ class StoreOrderRepository extends BaseRepository
             //给推广者分配养老金
             //给推广者分配佣金
             // if ($user_data['spread_uid'] != 0) {
-                if ($user_data['uid'] > 611) {
+                // if ($user_data['uid'] > 611) {
 
 
+                //查询下单用户上级身份
                 $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();
+
+                //业务员或以上的推荐人等级
+                $rate = static::getUserGroupRate($spread_data['user_group']);
+
                 //user_group=1是消费者，2:业务，3:业务经理，4:初级合伙人，5:中级合伙人,6:高级合伙人，7：董事
                 //业务或以上等级推广人
                 //获得养老金、佣金、贡献值和积分
@@ -9814,78 +9823,79 @@ class StoreOrderRepository extends BaseRepository
                     $yongjin = $spread_data['brokerage_price'] + $yj_amount_90;
                     $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
 
+                    $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
 
-                    if ($spread_data['user_group'] == 2) {
+                    // if ($spread_data['user_group'] == 2) {
 
-                        $con = $spread_data['contribute'] + bcmul($pv, 0.07, 2);
-                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.07, 2);
-                        //  Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
+                    //     $con = $spread_data['contribute'] + bcmul($pv, 0.07, 2);
+                    //     $score = $spread_data['brokerage_price'] + bcmul($pv, 0.07, 2);
+                    //     //  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,"推广会员专区商品赠送贡献值",1);
-                        //积分
-                        $this->score_log($spread_data['uid'], bcmul($pv, 0.07, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
+                    //     //贡献值
+                    //     // $this->con_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                    //     //积分
+                    //     $this->score_log($spread_data['uid'], bcmul($pv, 0.07, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
 
-                    } else if ($spread_data['user_group'] == 3) {
+                    // } else if ($spread_data['user_group'] == 3) {
 
 
-                        $con = $spread_data['contribute'] + bcmul($pv, 0.09, 2);
-                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.09, 2);
-                        // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
+                    //     $con = $spread_data['contribute'] + bcmul($pv, 0.09, 2);
+                    //     $score = $spread_data['brokerage_price'] + bcmul($pv, 0.09, 2);
+                    //     // 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,"推广会员专区商品赠送贡献值",1);
-                        //积分
-                        $this->score_log($spread_data['uid'], bcmul($pv, 0.09, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
+                    //     //贡献值
+                    //     // $this->con_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                    //     //积分
+                    //     $this->score_log($spread_data['uid'], bcmul($pv, 0.09, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
 
 
-                    } else if ($spread_data['user_group'] == 4) {
-                        $con = $spread_data['contribute'] + bcmul($pv, 0.11, 2);
-                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.11, 2);
-                        // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
+                    // } else if ($spread_data['user_group'] == 4) {
+                    //     $con = $spread_data['contribute'] + bcmul($pv, 0.11, 2);
+                    //     $score = $spread_data['brokerage_price'] + bcmul($pv, 0.11, 2);
+                    //     // 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,"推广会员专区商品赠送贡献值",1);
-                        //积分
-                        $this->score_log($spread_data['uid'], bcmul($pv, 0.11, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
+                    //     //贡献值
+                    //     //$this->con_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                    //     //积分
+                    //     $this->score_log($spread_data['uid'], bcmul($pv, 0.11, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
 
 
-                    } else if ($spread_data['user_group'] == 5) {
-                        $con = $spread_data['contribute'] + bcmul($pv, 0.13, 2);
-                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.13, 2);
-                        // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
+                    // } else if ($spread_data['user_group'] == 5) {
+                    //     $con = $spread_data['contribute'] + bcmul($pv, 0.13, 2);
+                    //     $score = $spread_data['brokerage_price'] + bcmul($pv, 0.13, 2);
+                    //     // 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,"推广会员专区商品赠送贡献值",1);
-                        //积分
-                        $this->score_log($spread_data['uid'], bcmul($pv, 0.13, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
+                    //     //贡献值
+                    //     // $this->con_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                    //     //积分
+                    //     $this->score_log($spread_data['uid'], bcmul($pv, 0.13, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
 
-                    } else if ($spread_data['user_group'] == 6) {
-                        $con = $spread_data['contribute'] + bcmul($pv, 0.15, 2);
-                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.15, 2);
-                        // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
+                    // } else if ($spread_data['user_group'] == 6) {
+                    //     $con = $spread_data['contribute'] + bcmul($pv, 0.15, 2);
+                    //     $score = $spread_data['brokerage_price'] + bcmul($pv, 0.15, 2);
+                    //     // 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,"推广会员专区商品赠送贡献值",1);
-                        //积分
-                        $this->score_log($spread_data['uid'], bcmul($pv, 0.15, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
+                    //     //贡献值
+                    //     // $this->con_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                    //     //积分
+                    //     $this->score_log($spread_data['uid'], bcmul($pv, 0.15, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
 
 
-                    } else if ($spread_data['user_group'] == 7) {
-                        $con = $spread_data['contribute'] + bcmul($pv, 0.17, 2);
-                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.17, 2);
-                        // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
+                    // } else if ($spread_data['user_group'] == 7) {
+                    //     $con = $spread_data['contribute'] + bcmul($pv, 0.17, 2);
+                    //     $score = $spread_data['brokerage_price'] + bcmul($pv, 0.17, 2);
+                    //     // 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,"推广会员专区商品赠送贡献值",1);
-                        //积分
-                        $this->score_log($spread_data['uid'], bcmul($pv, 0.17, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
+                    //     //贡献值
+                    //     //$this->con_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                    //     //积分
+                    //     $this->score_log($spread_data['uid'], bcmul($pv, 0.17, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
 
 
-                    }
+                    // }
                     Db::name('test_log')->insert(['note' => "走到这里4"]);//测试
                     //贡献值
-                    $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, $pv);
+                    $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, round($gx_jf, 2));
 
                     //养老金
                     $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
@@ -9893,14 +9903,13 @@ class StoreOrderRepository extends BaseRepository
                     $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['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, 1);
-
                 }
 
                 //普通的用户推广人
                 if ($spread_data['user_group'] == 1) {  
 
                     //获取贡献值和积分和佣金
-                    $gx_jf = $spread_data['contribute'] + bcmul($pv, 0.21, 2);
+                    $gx_jf = $spread_data['contribute'] + bcmul($pv, $rate, 2);
 
 
                     $yj_amount_90 = bcmul($yj1, 0.9, 2);
@@ -9912,14 +9921,15 @@ class StoreOrderRepository extends BaseRepository
 
 
                     //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'], bcmul($pv, 0.21, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, $pv);
-                    $this->score_log($spread_data['uid'], bcmul($pv, 0.21, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
+                    $this->con_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, bcmul($pv, 0.21, 2));
+                    $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
                     //推广佣金
                     $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id']);
                 }
 
 
-            } else if ($spread_data_old != 0) {
+            // } else if ($spread_data_old != 0) {
+                if ($spread_data_old != 0) {
 
                 //1.0jbp系统中，如果有用户升级会员，给推荐人贡献值(90%)和养老金(10%)
                 $spread_data = Db::name('user')->where('uid', $spread_data_old['id'])->find();
@@ -9934,7 +9944,7 @@ class StoreOrderRepository extends BaseRepository
                 $yongjin = $spread_data['brokerage_price'] + $yj_amount_90;
                 $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
 
-                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, $pv);
+                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, round($gx_jf, 2));
                 //养老金
                 $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . bcmul($pv, 0.035, 2), $store_order_data['mer_id']);
                 //佣金

app/controller/api/Notify.php

@@ -412,7 +412,7 @@ class Notify
  
                                 $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['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,"购买会员专区商品赠送贡献值",1, $pv);
+                                $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1, $gx_jf);
                                 $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
 
 
@@ -528,7 +528,7 @@ class Notify
                                         $this->score_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
-                                        $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, $pv);
+                                        $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, round($gx_jf,2));
 
                                         //养老金
                                         $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
@@ -562,7 +562,7 @@ class Notify
 
 
                                         //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.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, $pv);
+                                        $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, round($pv * 0.21,2));
                                         $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
                                         //推广佣金
                                         $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id']);
@@ -589,7 +589,7 @@ class Notify
                                     $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
 
 
-                                    $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, $pv);
+                                    $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, round($gx_jf,2));
                                     //养老金
                                     $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
                                     //佣金
@@ -1415,6 +1415,10 @@ class Notify
                 if (strpos($mark, "推广") !== false) {
                     Db::name('user')->where("uid",$uid)->update(['per_contribute'=>$con_data['per_contribute'] + $num]);
                 }
+
+                if($pv > 0){
+                    Db::name('user')->where("uid", $uid)->update(['pv' => $con_data['pv'] + $pv]);
+                }
              
                 //if(count($spread_data) > 0){
                     // $all_ids = [];

app/controller/api/user/User.php

@@ -260,6 +260,7 @@ class User extends BaseController
     public function getRecursiveChildrenChengji($parentUid, $number = 10) {
         $user = Db::name('user')->where('uid', $parentUid)->field('uid,spread_uid,contribute,per_contribute')->find();
         $user['contribute_sum'] = bcadd($user['contribute'], $user['per_contribute'], 2);
+        $user['contribute_sum'] = 0;
         $uids = [];// 用于存储符合条件的子级 uid
         $result = [$user]; // 用于存储符合条件的子级数据
 
@@ -1524,6 +1525,7 @@ class User extends BaseController
     // 根据父级uid,递归获取所有子级UID数组 默认深度10级
     public function getdepartmentStatistics($parentUid) {
         $user = Db::name('user')->where('uid', $parentUid)->field('uid,nickname,avatar,spread_uid,pv,create_time')->find();
+        $user['pv'] = 0;
         $uids = [];// 用于存储符合条件的子级 uid
         $result = [$user]; // 用于存储符合条件的子级数据