解决分配福利分两遍的问题

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

@@ -9862,31 +9862,31 @@ 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'], '推广获得佣金', $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();
-
-                $yj_amount_90 = $le_yw_amount * 0.9;
-                $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
-
-                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 0, "推广会员专区商品赠送贡献值", 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']);
-                //佣金
-                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id']);
-                //复购金
-                $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
-
-                $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']);
-                }
-            }
+            // if ($spread_data_old != 0) {
+            //     //1.0jbp系统中，如果有用户升级会员，给推荐人贡献值(90%)和养老金(10%)
+            //     $spread_data = Db::name('user')->where('uid', $spread_data_old['id'])->find();
+            //
+            //     $yj_amount_90 = $le_yw_amount * 0.9;
+            //     $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
+            //
+            //     $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 0, "推广会员专区商品赠送贡献值", 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']);
+            //     //佣金
+            //     $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id']);
+            //     //复购金
+            //     $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
+            //
+            //     $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']);
+            //     }
+            // }
 
             //锁客收益 todo 会员专区不做锁客 20250415
 //            if ($user_data['mer_id'] != 0) {

app/controller/api/Notify.php

@@ -338,7 +338,7 @@ class Notify
                                 //给推广者分配佣金(2.0系统中)
                            
                                  // 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();
                                     $StoreOrderRepository = app()->make(StoreOrderRepository::class);
@@ -478,49 +478,49 @@ class Notify
 
 
 
-                                }else 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 = bcmul($le_yw_amount,0.9,2);
-                                    $fgj_amount_10 = bcmul($le_yw_amount,0.1,2);//推广者的佣金抽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'],0,"推广会员专区商品赠送贡献值",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']);
-                                    //佣金
-                                    $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金',$store_order_data['mer_id']);
-                                    //复购金
-                                    $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
-
-       
-                                    $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)){
-                                       // $spread_data = Db::name('test_log')->insert(['note'=>"goodsofinf22222o:".json_encode($goods_of_info1)]);
-
-                                        $this->member_update($orderInfo,$goods_of_info1,$user_data['uid']);
-                                    }
-
-
-
-                                }
+                                // }else 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 = bcmul($le_yw_amount,0.9,2);
+                                //     $fgj_amount_10 = bcmul($le_yw_amount,0.1,2);//推广者的佣金抽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'],0,"推广会员专区商品赠送贡献值",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']);
+                                //     //佣金
+                                //     $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金',$store_order_data['mer_id']);
+                                //     //复购金
+                                //     $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
+                                //
+                                //
+                                //     $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)){
+                                //        // $spread_data = Db::name('test_log')->insert(['note'=>"goodsofinf22222o:".json_encode($goods_of_info1)]);
+                                //
+                                //         $this->member_update($orderInfo,$goods_of_info1,$user_data['uid']);
+                                //     }
+                                //
+                                //
+                                //
+                                // }
 
                                 //锁客收益  todo 会员专区不做锁客 20250415
 //                                if($user_data['mer_id'] != 0){