赠送贡献值的时候附带pv记录

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

@@ -9230,7 +9230,7 @@ class StoreOrderRepository extends BaseRepository
 
 
     //添加贡献值日志
-    public function con_log($uid, $num, $order_id, $order_type, $mark, $status = -1)
+    public function con_log($uid, $num, $order_id, $order_type, $mark, $status = -1, $pv = 0)
     {
 
         $con_data = Db::name('user')->where("uid", $uid)->find();
@@ -9238,7 +9238,7 @@ class StoreOrderRepository extends BaseRepository
         if ($status == 1) {
             //$con_data_gongxian = Db::name('user')->where("uid", $uid)->update(['contribute' => $con_data['contribute'] + $num]);
             //如果当前用户是业务经理之前的等级，那么需要将当前用户的直推用户贡献值加到自己贡献值中去
-            if ($con_data['user_group'] <= 2) {
+            // if ($con_data['user_group'] <= 2) {
 
                 $spread_data = Db::name('user')->where("spread_uid", $uid)->select();
 
@@ -9288,24 +9288,25 @@ class StoreOrderRepository extends BaseRepository
 
                 // }
 
-            } else {
+            // } else {
 
-                // 检查是否包含“推广”
-                // if (strpos($mark, "推广") !== false) {
-                //     echo "字符串1包含'推广'\n";
-                // }
+            //     // 检查是否包含“推广”
+            //     // if (strpos($mark, "推广") !== false) {
+            //     //     echo "字符串1包含'推广'\n";
+            //     // }
 
-                // 检查是否包含“购买”
-                if (strpos($mark, "购买") !== false) {
-                    Db::name('user')->where("uid", $uid)->update(['contribute' => $con_data['contribute'] + $num]);
-                }
+            //     // 检查是否包含“购买”
+            //     if (strpos($mark, "购买") !== false) {
+            //         Db::name('user')->where("uid", $uid)->update(['contribute' => $con_data['contribute'] + $num]);
+            //     }
 
 
-            }
+            // }
         }
 
         $con = [
             'uid' => $uid,
+            'pv' => $pv,
             'number' => $num,//赠送数量
             'status' => $status,//红包状态
             'mark' => $mark,//备注
@@ -9691,7 +9692,7 @@ 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'], 0);
                         // 贡献值
-                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, $pv);
                         //积分
                         $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分");
                     }
@@ -9773,7 +9774,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);
+            $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1, $pv);
             $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
 
             //查询下单用户上级身份（2.0新表用户）
@@ -9884,7 +9885,7 @@ class StoreOrderRepository extends BaseRepository
                     }
                     Db::name('test_log')->insert(['note' => "走到这里4"]);//测试
                     //贡献值
-                    $this->con_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->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']);
@@ -9911,7 +9912,7 @@ 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);
+                    $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->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']);
@@ -9933,7 +9934,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);
+                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, $pv);
                 //养老金
                 $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);
+                                $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1, $pv);
                                 $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);
+                                        $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, $pv);
 
                                         //养老金
                                         $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);
+                                        $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, $pv);
                                         $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);
+                                    $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, $pv);
                                     //养老金
                                     $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']);
                                     //佣金
@@ -1396,15 +1396,15 @@ class Notify
 
 
     //添加贡献值日志
-    public function con_log($uid,$num,$order_id,$order_type,$mark,$status = -1){
+    public function con_log($uid,$num,$order_id,$order_type,$mark,$status = -1, $pv = 0){
 
         $con_data = Db::name('user')->where("uid",$uid)->find();
         //如果状态是1那就是即刻入账，
         if($status == 1){
           
 
-            //如果当前用户是业务经理之前的等级，那么需要将当前用户的直推用户贡献值加到自己贡献值中去
-            if( $con_data['user_group'] <= 2 ){
+            // //如果当前用户是业务经理之前的等级，那么需要将当前用户的直推用户贡献值加到自己贡献值中去
+            // if( $con_data['user_group'] <= 2 ){
            
                 $spread_data = Db::name('user')->where("spread_uid",$uid)->select();
 
@@ -1456,27 +1456,28 @@ class Notify
 
                // }
 
-            }else{
+            // }else{
                 
-                // 检查是否包含“推广”
-                // if (strpos($mark, "推广") !== false) {
-                //     echo "字符串1包含'推广'\n";
-                // }
+            //     // 检查是否包含“推广”
+            //     // if (strpos($mark, "推广") !== false) {
+            //     //     echo "字符串1包含'推广'\n";
+            //     // }
 
-                // 检查是否包含“购买”
-                if (strpos($mark, "购买") !== false) {
-                    Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
-                }
+            //     // 检查是否包含“购买”
+            //     if (strpos($mark, "购买") !== false) {
+            //         Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+            //     }
 
                  
                
                
-            }
+            // }
 
         }
 
         $con = [
             'uid'=>$uid,
+            'pv' => $pv,
             'number'=>$num,//赠送数量
             'status'=>$status,//红包状态
             'mark'=>$mark,//备注