Merge branch 'master' into huangfamily

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -1400,6 +1400,10 @@ class OrderMerchantRepository extends BaseRepository
             $user_contribute = Db::name('user')->where('uid', $order["uid"])->value('contribute');
             $user_contribute = bcadd($user_contribute, (float)$pv,2);
             Db::name('user')->where('uid', $order["uid"])->update(['contribute'=>$user_contribute]);
+            /** @var StoreOrderRepository $StoreOrderRepository */
+            $StoreOrderRepository = app()->make(StoreOrderRepository::class);
+            // 用户获得pv值
+            $StoreOrderRepository->con_log_pv($order["uid"],$pv,$order_id,1,'扫码消费获得赠送PV值',1);
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，积分和贡献值低于0.01无法入库 特此记录！']);
         }

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

@@ -2403,7 +2403,7 @@ class StoreOrderRepository extends BaseRepository
 //                        ['type' => 'b1', 'price' => $jcvr, 'other' => $jcjf, 'note' => "VR+积分"],
                             ['type' => 'b2', 'price' => $jcprice, 'other' => $jcjf1, "note" => "现金+积分"],
                             // ['type'=>'b3','price'=>$jcvr1,'other'=>$jcjd,"note"=>"VR+京豆"],
-                            ['type' => 'b4', 'price' => $jcvr1, 'other' => $jcjd, "note" => "现金+京豆"],
+//                            ['type' => 'b4', 'price' => $jcvr1, 'other' => $jcjd, "note" => "现金+京豆"],
 //                        ['type' => 'b5', 'price' => $orderpri, 'other' => 0, "note" => "VR"],
                             ['type' => 'b6', 'price' => $orderpri, 'other' => 0, "note" => "现金"],
 
@@ -9253,23 +9253,28 @@ class StoreOrderRepository extends BaseRepository
         return $group;
     }
 
-    public function con_log_pv($uid, $num, $order_id, $order_type, $mark, $status = -1)
+    public function con_log_pv($uid, $pv, $order_id, $order_type, $mark, $status = -1)
     {
         // 添加pv记录
         $pv_data = [
             "uid" => $uid,
-            "pv" => $num,
+            "pv" => $pv,
             "addtime" => time(),
             "status" => $status,
             "order_type" => $order_type,
             "order_id" => $order_id,
-            "mark" => str_replace('贡献值', 'PV', $mark),
+            "mark" => $mark,
         ];
+        // 当状态为1时是实时结算
+        if($status == 1) {
+            Db::name('user')->where('uid', $uid)->inc('pv', (float)$pv)->update();
+            $pv_data['settlement_time'] = date('Y-m-d H:i:s');
+        }
         Db::name("user_pv_log")->insert($pv_data);//添加pv记录
     }
 
     //添加贡献值日志
-    public function con_log($uid, $num, $order_id, $order_type, $mark, $status = -1, $pv = 0)
+    public function con_log($uid, $num, $order_id, $order_type, $mark, $status = -1)
     {
 
         $con_data = Db::name('user')->where("uid", $uid)->find();
@@ -9289,10 +9294,6 @@ 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){
@@ -9349,7 +9350,6 @@ class StoreOrderRepository extends BaseRepository
 
         $con = [
             'uid' => $uid,
-            'pv' => $pv,
             'number' => $num,//赠送数量
             'status' => $status,//红包状态
             'mark' => $mark,//备注
@@ -9563,214 +9563,81 @@ class StoreOrderRepository extends BaseRepository
         $store_product_data = Db::name('store_product')->where('product_id', $store_order_product_data['product_id'])->find();
         //下单用户
         $user_data = Db::name('user')->where('uid', $store_order_data['uid'])->find();
-        //var_dump($user_data['spread_uid']);
 
-        //$concession_pri = $store_product_data['concession_pri'];//商家让利金额
+        //商家让利金额
         $concession_pri = $store_order_data['con_pri'];
 
 
-        $spread_uid = 0;//下单用户上级uid
-        $fgj_pri = 0;//推广者的佣金抽10%到个人复购金
-
         $pv = 0; //待分配的PV
 
-
-        //var_dump($store_product_data['concession_pri']);return;
         //精彩生活
         if ($store_order_data['mer_id'] == 439) {
             //分配参数
-            $job_par = [];
             if (!empty($store_order_data)) {
-                $job_par = json_decode($store_order_data['fzone_paytype'], true);
-                //if($job_par['note'] == "现金"){
                 //普通消费者
                 $ylj_pri = bcmul($concession_pri, 0.3, 2);
                 $pv = bcmul($concession_pri, 0.35, 2);
 
-                //分配养老金给消费者
-                $ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
-                //分配积分和贡献值给消费者
-                $con = $user_data['contribute'] + $pv;
-                $score = $user_data['score'] + $pv;
-
-                // Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,"contribute"=>$con,"score"=>$score]);
-
                 $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
                 // 贡献值
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送贡献值");
-                $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送贡献值");
+                $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送PV值");
                 // 积分
                 $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送积分");
 
-                //给推广者分配养老金
-                //给推广者分配佣金
-               // if ($user_data['spread_uid'] != 0) {
-                if ($user_data['uid'] > 611) {
-                    //查询下单用户上级身份
-                    $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();
+                //查询下单用户上级身份
+                $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();
 
+                if (!empty($spread_data)) {
                     //业务员或以上的推荐人等级
                     $rate = static::getUserGroupRate($spread_data['user_group']);
-                    if ($spread_data['user_group'] > 1) {
-
-                        // //给推广者分配佣金
-                        $yj_amount = 0;
-                        $ylj_amount = $spread_data['annuity'] + bcmul($pv, 0.05, 2);
-                        $ssf = 0;//变量
-                        $yj_amount_90 = 0;//90%的佣金
-
-                        if ($spread_data['user_group'] == 2) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
-
-
-                            // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
-                        } else if ($spread_data['user_group'] == 3) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
-
-                            // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
-                        } else if ($spread_data['user_group'] == 4) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
 
-                            //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
-                        } else if ($spread_data['user_group'] == 5) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-                            // $yj_amount = $spread_data['brokerage_price'] + round($pv * $rate,2);
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
-
-                            // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
-                        } else if ($spread_data['user_group'] == 6) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
-
-                            // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
-                        } else if ($spread_data['user_group'] == 7) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
-
-                            // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
-                        }
-
-                        //贡献值
-                        $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, "精彩生活区商品赠送积分");
-                        // //推广佣金
-                        $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'], 0);
-                        //养老金
-                        $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . bcmul($pv, 0.05, 2), $store_order_data['mer_id'], 0);
-                    }
-
-                    //普通用户推广人
                     if ($spread_data['user_group'] == 1) {
-                        //给推广者分配佣金
-
                         $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
                         $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
-                        $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);
 
-                        //Db::name('user')->where('uid',$spread_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
-
-                        $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                        $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-                        //贡献值和积分
-                        // Db::name('user')->where('uid',$spread_data['uid'])->update(["contribute"=>$con,"score"=>$score]);
-
                         //推广养老金
                         //推广佣金
                         $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'], 0);
                         // 贡献值
-                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, $pv);
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广精彩生活商品赠送贡献值");
+                        //积分
+                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广精彩生活商品赠送积分");
+                    } else if ($spread_data['user_group'] > 1) {
+
+                        $ssf = bcmul($pv, $rate, 2);
+                        $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                        $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
+
+                        //贡献值
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广精彩生活区商品赠送贡献值");
                         //积分
-                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分");
+                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "推广精彩生活区商品赠送积分");
+                        // //推广佣金
+                        $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'], 0);
+                        //养老金
+                        $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . bcmul($pv, 0.05, 2), $store_order_data['mer_id'], 0);
                     }
                 }
 
                 //锁客收益
                 if ($user_data['mer_id'] != 0) {
-
                     $merchant_data = Db::name('merchant')->where('mer_id', $user_data['mer_id'])->find();
-
                     $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
-
                     if (!empty($merchant_user_data)) {
-
                         //给推广者分配佣金
-
                         $yj_amount_90 = bcmul($pv, 0.05, 2) * 0.9;
                         $fgj_amount_10 = bcmul($pv, 0.05, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                        // $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
-                        // $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
-                        // $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
-
-
-                        // Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                         //推广佣金
                         $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
-
                     }
-
                 }
             }
 
-            //VIP专区
+        //VIP专区
         } else if ($store_order_data['mer_id'] == 496) {
 
             //业务员和以上推广的等级获得推广佣金
@@ -9805,27 +9672,11 @@ class StoreOrderRepository extends BaseRepository
                 $le_yw_amount = 600;
             }
 
-            $ylj_pri = bcmul($pv, 0.035, 2);
-            //$pv = round($pv * 0.35,2);
-
-            //分配养老金给消费者
-            //普通用户获取贡献值和pv3.5%养老金和积分
-            $ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
-            $gxz_amount_mine = $user_data['contribute'] + $gx_jf;
-            $jf_amount_mine = $user_data['score'] + $gx_jf;
-
-
-            // 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, $gx_jf);
-            // $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_pv($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1);
-            // $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1);
+            $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值",1);
+            $this->con_log_pv($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送PV值", 1);
             $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
 
-            //查询下单用户上级身份（2.0新表用户）
-            $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();
             //查询下单用户上级身份（1.0表用户，会员升级）
             $spread_data_old = 0;
             if ($user_data['spread_old'] != 0) {
@@ -9833,161 +9684,53 @@ class StoreOrderRepository extends BaseRepository
                 if (!empty($sf)) {
                     $spread_data_old = $sf;
                 }
-
             }
 
-            //给推广者分配养老金
-            //给推广者分配佣金
-            // if ($user_data['spread_uid'] != 0) {
-                // 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：董事
-                //业务或以上等级推广人
-                //获得养老金、佣金、贡献值和积分
-                if ($spread_data['user_group'] > 1) {
-
-
-                    $con = 0;//贡献值
-                    $score = 0;//积分
-                    //养老金
-                    $uer_bill = $spread_data['annuity'] + bcmul($pv, 0.035, 2);
-                    //$yongjin = $spread_data['brokerage_price'] + $le_yw_amount;
-
-                    $yj_amount_90 = $le_yw_amount * 0.9;
-                    $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
-
-                    $yongjin = $spread_data['brokerage_price'] + $yj_amount_90;
-                    $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
-
-                    $this->score_log($spread_data['uid'], bcmul($gx_jf, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
-
-                    // 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]);
-
-                    //     //贡献值
-                    //     // $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) {
-
-
-                    //     $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);
-
-
-                    // } 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);
-
-
-                    // } 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);
-
-                    // } 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);
-
-
-                    // } 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);
-
-
-                    // }
-                    Db::name('test_log')->insert(['note' => "走到这里4"]);//测试
-                    //贡献值
-                    $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']);
-                    //佣金
-                    $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, $rate, 2);
-
+            //查询下单用户上级身份
+            $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();
 
-                    $yj_amount_90 = bcmul($yj1, 0.9, 2);
-                    $fgj_amount_10 = bcmul($yj1, 0.1, 2);//推广者的佣金抽10%到个人复购金
+            //业务员或以上的推荐人等级
+            $rate = static::getUserGroupRate($spread_data['user_group']);
 
-                    $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, 1);
+            //user_group=1是消费者，2:业务，3:业务经理，4:初级合伙人，5:中级合伙人,6:高级合伙人，7：董事
+            //业务或以上等级推广人
+            //获得养老金、佣金、贡献值和积分
+            if ($spread_data['user_group'] > 1) {
 
+                $yj_amount_90 = $le_yw_amount * 0.9;
+                $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
 
-                    //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($gx_jf, 0.3, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, bcmul($gx_jf, 0.3, 2));
-                    $this->score_log($spread_data['uid'], bcmul($gx_jf, $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']);
-                }
+                $this->score_log($spread_data['uid'], bcmul($gx_jf, $rate, 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);
 
+                //养老金
+                $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']);
+                //佣金
+                $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);
+            }
 
-            // } else if ($spread_data_old != 0) {
-                if ($spread_data_old != 0) {
+            //普通的用户推广人
+            if ($spread_data['user_group'] == 1) {
+                $yj_amount_90 = bcmul($yj1, 0.9, 2);
+                $fgj_amount_10 = bcmul($yj1, 0.1, 2);//推广者的佣金抽10%到个人复购金
+                $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
+                $this->con_log($spread_data['uid'], bcmul($gx_jf, 0.3, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
+                $this->score_log($spread_data['uid'], bcmul($gx_jf, $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']);
+            }
 
+            if ($spread_data_old != 0) {
                 //1.0jbp系统中，如果有用户升级会员，给推荐人贡献值(90%)和养老金(10%)
                 $spread_data = Db::name('user')->where('uid', $spread_data_old['id'])->find();
-                //$spread_data = Db::name('user')->where('uid',473)->find();
-                //养老金
-                $uer_bill = $spread_data['annuity'] + bcmul($pv, 0.035, 2);
-
 
                 $yj_amount_90 = $le_yw_amount * 0.9;
                 $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
 
-                $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, round($gx_jf, 2));
+                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
                 //养老金
                 $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']);
                 //佣金
@@ -9995,90 +9738,30 @@ class StoreOrderRepository extends BaseRepository
                 //复购金
                 $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
 
-                //      $bill = [
-                //     'uid'=>$spread_data['uid'],
-                //     'number'=>$fgj_amount_10,//数量
-                //     'status'=>1,//复购金状态1-有效 0-失效 -1待确认
-                //     'mark'=>"复购金",//备注
-                //   //  'desc'=>"抽取佣金的10%作为复购金",//描述
-                //     'order_id'=>$store_order_data['order_id'],//订单id
-                //     'surplus'=>0,//剩余
-                //     'order_type'=>11,//关联订单ID
-                //     'type'=>1,//复购金类型 :1赠送，2消耗
-                //     'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
-                //     'addtime'=>time(),
-                // ];
-
-                // $poi = Db::name('user_sign_fugou')->insert($bill);
-
-                // Db::name("test_log")->insert(["note"=>$spread_data['uid'] . " value:" .$fgj_amount_10 . " order:".$store_order_data['order_id']."dd:" .json_encode($bill)]);
-
                 $orderInfo = [
                     'num' => 1,
                     'gb_num' => 1,
                     'price' => $store_product_data['price']
                 ];
-
                 $goods_of_info1 = Db::name("old_user_of_goods")->where("id", $store_order_data['user_of_goods_id'])->find();//用户的订单价格表
                 if (!empty($goods_of_info1)) {
                     $this->member_update($orderInfo, $goods_of_info1, $user_data['uid']);
                 }
-
-
             }
 
-            // 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'=>$status,//复购金状态1-有效 0-失效 -1待确认
-            //         'mark'=>"复购金",//备注
-            //         'desc'=>"抽取佣金的10%作为复购金",//描述
-            //         'order_id'=>$order_id,//订单id
-            //         'surplus'=>0,//剩余
-            //         'order_type'=>11,//关联订单ID
-            //         'type'=>$type_inc_des,//复购金类型 :1赠送，2消耗
-            //         'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
-            //         'addtime'=>time(),
-            //     ];
-
-            //     Db::name('user_sign_fugou')->insert($bill);
-            // }
-
-
             //锁客收益
             if ($user_data['mer_id'] != 0) {
-
                 $merchant_data = Db::name('merchant')->where('mer_id', $user_data['mer_id'])->find();
-
                 $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
-
                 if (!empty($merchant_data) && !empty($merchant_user_data)) {
-
-
                     $yj_amount_90 = bcmul($pv , 0.035, 2) * 0.9;
                     $fgj_amount_10 = bcmul($pv, 0.035, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                    $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
-                    $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
                     $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
-
-
-                    // Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                     //推广佣金
                     $this->bill_user_log($merchant_data['uid'], bcmul($pv, 0.35, 2), $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . round($pv * 0.35, 2), $store_order_data['mer_id']);
                 }
-
             }
 
-
             //会员专区，给用户升级判断
             $orderList = Db::name("store_order")->where("uid", $store_order_data['uid'])->where("mer_id", 496)->where("status", "in", [0, 1, 2, 3])->select();
             // 初始化总和变量
@@ -10093,14 +9776,12 @@ class StoreOrderRepository extends BaseRepository
             $userdata = Db::name("user")->where("uid", $store_order_data['uid'])->find();
 
             if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
-
                 if ($userdata['user_group'] <= 1) {
 //                    Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
                     /** @var UserRepository $userRepository */
                     $userRepository = app()->make(UserRepository::class);
                     $userRepository->setUserIdentity($store_order_data['uid']);
                 }
-
             } else if ($totalPayPrice >= 11800) {
                 if ($userdata['user_group'] <= 2) {
 //                    Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
@@ -10110,7 +9791,6 @@ class StoreOrderRepository extends BaseRepository
                 }
             }
 
-
         } else {
             // 商贸区
             /** @var \app\common\repositories\merchant\MerchantRepository $merchant */
@@ -10122,115 +9802,30 @@ class StoreOrderRepository extends BaseRepository
                 $ylj_pri = bcmul($concession_pri, 0.3, 2); // 让利部分30%给消费者做养老金
                 $pv = bcmul($concession_pri, 0.35, 2); // 35%做业绩PV分配
 
-                //分配养老金给消费者
-                $ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
-                //分配积分和贡献值给消费者
-                $con = $user_data['contribute'] + $pv;
-                $score = $user_data['score'] + $pv;
-
                 // 让利部分30%给消费者做养老金{$ylj_pri}
                 $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $group_order['group_order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
-                // @todo 消费者购买商品赠送PV等值的积分和贡献值
-                // 贡献值
-//                $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
+                // 购买商贸区赠送贡献值
+                $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
+                // 购买商贸区赠送PV值
+                $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区赠送PV值");
                 // 积分
                 $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送积分");
 
-                // @todo ------------PV业绩100%分配如下------------------
                 if ($user_data['spread_uid'] != 0) {
                     //查询下单用户上级
                     $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();
 
                     $rate = static::getUserGroupRate($spread_data['user_group']);
                     if ($spread_data['user_group'] > 1) {
-                        $ssf = 0;//变量
-                        $yj_amount_90 = 0;//90%的佣金
-                        // 业务员
-                        if ($spread_data['user_group'] == 2) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
-                        } else if ($spread_data['user_group'] == 3) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
-
-                            // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
-                        } else if ($spread_data['user_group'] == 4) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
-
-                            //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
-                        } else if ($spread_data['user_group'] == 5) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-                            // $yj_amount = $spread_data['brokerage_price'] + round($pv * $rate,2);
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
-
-                            // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
-                        } else if ($spread_data['user_group'] == 6) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
-
-                            // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
-                        } else if ($spread_data['user_group'] == 7) {
-                            $ssf = bcmul($pv, $rate, 2);
-                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-
-                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                            $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);
-
-                            // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
-                        }
+                        $ssf = bcmul($pv, $rate, 2);
+                        $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                        $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                         //贡献值
-                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "商贸区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
                         //积分
-                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 12, "商贸区商品赠送积分");
+                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
                         //推广佣金
                         $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'], 0);
                         //养老金
@@ -10244,18 +9839,8 @@ class StoreOrderRepository extends BaseRepository
                         $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
                         $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
-                        $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);
 
-                        //Db::name('user')->where('uid',$spread_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
-
-                        $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
-                        $score = $spread_data['score'] + bcmul($pv, $rate, 2);
-
-                        //贡献值和积分
-                        // Db::name('user')->where('uid',$spread_data['uid'])->update(["contribute"=>$con,"score"=>$score]);
-
                         //推广佣金
                         $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'], 0);
                         // 贡献值
@@ -10273,11 +9858,7 @@ class StoreOrderRepository extends BaseRepository
                         //给推广者分配佣金
                         $yj_amount_90 = bcmul($pv, 0.05, 2) * 0.9;
                         $fgj_amount_10 = bcmul($pv, 0.05, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-
-                        $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
-                        $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
                         $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
-
                         //推广佣金
                         $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                     }
@@ -10285,27 +9866,27 @@ class StoreOrderRepository extends BaseRepository
                     $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
                     $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_two']);
 
-                    //商户获得贡献值
-                    if ($concession_pri >= 0.01) {
-                        $gonxian = bcmul($concession_pri, $jdAndGonxianConfig['gonxian'], 2);
-                        $gongxian_data = [
-                            "uid" => $merchant_data["uid"],
-                            "mer_id" => $user_data['mer_id'],
-                            "pv" => $pv,
-                            "number" => $gonxian,
-                            "addtime" => time(),
-                            "status" => -1,
-                            "order_type" => 2,
-                            "order_id" => $store_order_data['order_id'],
-                            "mark" => "锁客商家获得贡献值",
-                            "desc" => '',
-                            "surplus" => $gonxian,
-                            "type" => 1
-                        ];
-                        Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-                    } else {
-                        Db::name('log')->insert(['data' => '订单号：' . $store_order_data['order_id'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
-                    }
+                    //商户获得贡献值  ---- 3月29日  商户不再获得贡献值 改为获得分润值
+//                    if ($concession_pri >= 0.01) {
+//                        $gonxian = bcmul($concession_pri, $jdAndGonxianConfig['gonxian'], 2);
+//                        $gongxian_data = [
+//                            "uid" => $merchant_data["uid"],
+//                            "mer_id" => $user_data['mer_id'],
+//                            "pv" => $pv,
+//                            "number" => $gonxian,
+//                            "addtime" => time(),
+//                            "status" => -1,
+//                            "order_type" => 2,
+//                            "order_id" => $store_order_data['order_id'],
+//                            "mark" => "锁客商家获得贡献值",
+//                            "desc" => '',
+//                            "surplus" => $gonxian,
+//                            "type" => 1
+//                        ];
+//                        Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+//                    } else {
+//                        Db::name('log')->insert(['data' => '订单号：' . $store_order_data['order_id'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
+//                    }
 
                     //商户获得京豆
                     if ($concession_pri >= 0.01) {
@@ -10340,27 +9921,16 @@ class StoreOrderRepository extends BaseRepository
 
         //当前用户在1.0中没有注册，但是父级在1.0系统中注册过。
         if (!empty($sf)) {
-
             //检查用户在旧表中是否与上级，有的话就是升级权限，要新增一个user_of_goods的表
             if ($store_order_data['user_of_goods_id'] != 1) {
-
                 $data1['id'] = $store_order_data['user_of_goods_id'];
                 $data1['status'] = 1;
-
-
                 $data1['create_time'] = time();
-
-                //return app('json')->fail("333");
-
                 $sfe = Db::name('old_user_of_goods')->update($data1);
             }
-
-
         }
 
         //1.0老用户在新2.0表中升级 end
-
-
     }
 
     /**

app/controller/api/Notify.php

@@ -2,8 +2,10 @@
 namespace app\controller\api;
 
 use AdaPaySdk\AdapayTools;
+use app\common\repositories\merchant\order\OrderMerchantRepository;
 use app\common\repositories\movie\MovieRepository;
 use app\common\repositories\store\order\StoreRefundOrderRepository;
+use app\common\repositories\system\merchant\MerchantRepository;
 use app\common\repositories\user\UserRepository;
 use app\controller\api\merchant\sxy\Access;
 use app\controller\api\store\service\Huafei;
@@ -181,7 +183,7 @@ class Notify
                                     //Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,"contribute"=>$con,"score"=>$score]);
 
                                     $this->bill_user_log($user_data['uid'],$ylj_pri,$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.$ylj_pri,$store_order_data['mer_id'],0);
-                                    $this->con_log_pv($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送贡献值");
+                                    $this->con_log_pv($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送pv");
                                     $this->con_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送贡献值");
                                     $this->score_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送积分");
 
@@ -417,9 +419,9 @@ 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_pv($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
+                                $this->con_log_pv($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送pv",1);
                                 // $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
-                                $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1, $gx_jf);
+                                $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);
 
 
@@ -535,7 +537,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, round($gx_jf,2));
+                                        $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
 
                                         //养老金
                                         $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']);
@@ -569,7 +571,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.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, round($pv * 0.21,2));
+                                        $this->con_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                         $this->score_log($spread_data['uid'],round($pv * 0.3,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']);
@@ -596,7 +598,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, round($gx_jf,2));
+                                    $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                     //养老金
                                     $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']);
                                     //佣金
@@ -715,6 +717,125 @@ class Notify
                                 }
 
 
+                            } else {
+                                // 商贸区
+                                /** @var \app\common\repositories\merchant\MerchantRepository $merchant */
+                                $merchant = app()->make(MerchantRepository::class);
+                                $merchantInfo = $merchant->get($store_order_data['mer_id']);
+                                // 1企业2个体3个人
+                                if ($merchantInfo && !empty($store_order_data) && in_array($merchantInfo['type'], [2, 3])) {
+                                    //商家让利部分的拆分
+                                    $ylj_pri = bcmul($concession_pri, 0.3, 2); // 让利部分30%给消费者做养老金
+                                    $pv = bcmul($concession_pri, 0.35, 2); // 35%做业绩PV分配
+
+                                    // 让利部分30%给消费者做养老金{$ylj_pri}
+                                    $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $group_order['group_order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
+                                    // 购买商贸区赠送贡献值
+                                    $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
+                                    // 购买商贸区赠送PV值
+                                    $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区赠送PV值");
+                                    // 积分
+                                    $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送积分");
+
+                                    if ($user_data['spread_uid'] != 0) {
+                                        //查询下单用户上级
+                                        $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();
+                                        /** @var \app\common\repositories\store\order\StoreOrderRepository $StoreOrderRepository */
+                                        $rate = $StoreOrderRepository->getUserGroupRate($spread_data['user_group']);
+                                        if ($spread_data['user_group'] > 1) {
+                                            $ssf = bcmul($pv, $rate, 2);
+                                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                            $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
+
+                                            //贡献值
+                                            $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
+                                            //积分
+                                            $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
+                                            //推广佣金
+                                            $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'], 0);
+                                            //养老金
+                                            $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '推广获得养老金' . round($pv * 0.05, 2), $store_order_data['mer_id'], 0);
+                                        }
+
+                                        //普通用户推广人
+                                        if ($spread_data['user_group'] == 1) {
+                                            //给推广者分配佣金
+
+                                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+
+                                            $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 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'], 0);
+                                            // 贡献值
+                                            $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
+                                            // 积分
+                                            $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
+                                        }
+                                    }
+
+                                    //锁客收益
+                                    if ($user_data['mer_id'] != 0) {
+                                        $merchant_data = Db::name('merchant')->where('mer_id', $user_data['mer_id'])->find();
+                                        $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
+                                        if (!empty($merchant_user_data)) {
+                                            //给推广者分配佣金
+                                            $yj_amount_90 = bcmul($pv, 0.05, 2) * 0.9;
+                                            $fgj_amount_10 = bcmul($pv, 0.05, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                            $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
+                                            //推广佣金
+                                            $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                                        }
+                                        /** @var OrderMerchantRepository $orderMerchantRepository */
+                                        $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
+                                        $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_two']);
+
+                                        //商户获得贡献值  ---- 3月29日  商户不再获得贡献值 改为获得分润值
+                    //                    if ($concession_pri >= 0.01) {
+                    //                        $gonxian = bcmul($concession_pri, $jdAndGonxianConfig['gonxian'], 2);
+                    //                        $gongxian_data = [
+                    //                            "uid" => $merchant_data["uid"],
+                    //                            "mer_id" => $user_data['mer_id'],
+                    //                            "pv" => $pv,
+                    //                            "number" => $gonxian,
+                    //                            "addtime" => time(),
+                    //                            "status" => -1,
+                    //                            "order_type" => 2,
+                    //                            "order_id" => $store_order_data['order_id'],
+                    //                            "mark" => "锁客商家获得贡献值",
+                    //                            "desc" => '',
+                    //                            "surplus" => $gonxian,
+                    //                            "type" => 1
+                    //                        ];
+                    //                        Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+                    //                    } else {
+                    //                        Db::name('log')->insert(['data' => '订单号：' . $store_order_data['order_id'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
+                    //                    }
+
+                                        //商户获得京豆
+                                        if ($concession_pri >= 0.01) {
+                                            $jd = bcmul($concession_pri, $jdAndGonxianConfig['jd'], 2);
+                                            $jd_data = [
+                                                "uid" => $merchant_data["uid"],
+                                                "mer_id" => $user_data['mer_id'],
+                                                "number" => $jd,
+                                                "addtime" => time(),
+                                                "status" => -1,
+                                                "order_type" => 2,
+                                                "order_id" => $store_order_data['order_id'],
+                                                "mark" => "锁客商家获得京豆",
+                                                "desc" => '',
+                                                "surplus" => $jd,
+                                                "type" => 1
+                                            ];
+                                            Db::name("user_sign_jingdou")->insert($jd_data);//添加记录
+                                        } else {
+                                            Db::name('log')->insert(['data' => '订单号：' . $store_order_data['order_id'] . '付款额度较低或 商家、平台设置的返佣比例较低，京豆低于0.01无法入库 特此记录！']);
+                                        }
+                                    }
+                                }
                             }
 
                          
@@ -1404,23 +1525,28 @@ class Notify
         return $newList;
     }
 
-    public function con_log_pv($uid, $num, $order_id, $order_type, $mark, $status = -1)
+    public function con_log_pv($uid, $pv, $order_id, $order_type, $mark, $status = -1)
     {
         // 添加pv记录
         $pv_data = [
             "uid" => $uid,
-            "pv" => $num,
+            "pv" => $pv,
             "addtime" => time(),
             "status" => $status,
             "order_type" => $order_type,
             "order_id" => $order_id,
-            "mark" => str_replace('贡献值', 'PV', $mark),
+            "mark" => $mark,
         ];
+        // 当状态为1时是实时结算
+        if($status == 1) {
+            Db::name('user')->where('uid', $uid)->inc('pv', (float)$pv)->update();
+            $pv_data['settlement_time'] = date('Y-m-d H:i:s');
+        }
         Db::name("user_pv_log")->insert($pv_data);//添加pv记录
     }
 
     //添加贡献值日志
-    public function con_log($uid,$num,$order_id,$order_type,$mark,$status = -1, $pv = 0){
+    public function con_log($uid,$num,$order_id,$order_type,$mark,$status = -1){
 
         $con_data = Db::name('user')->where("uid",$uid)->find();
         //如果状态是1那就是即刻入账，
@@ -1443,10 +1569,6 @@ class Notify
                     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){
@@ -1511,7 +1633,6 @@ class Notify
 
         $con = [
             'uid'=>$uid,
-            'pv' => $pv,
             'number'=>$num,//赠送数量
             'status'=>$status,//红包状态
             'mark'=>$mark,//备注

app/controller/api/user/User.php

@@ -322,6 +322,7 @@ class User extends BaseController
             //     $data['total_source'] =  $con['contribute'] + $con['per_contribute'];
             // }else{
             $data['total_source'] =  $con['contribute'];
+            $data['zhitui'] =  $con['per_contribute'];
             // }