更新

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

@@ -1575,7 +1575,7 @@ class StoreOrderRepository extends BaseRepository
                             }
                         }
                         $order['product_id'] = $v['product_id'];
-                        $this->gongFuDistribution($order, $order['product_id'], $v['product_attr_unique'], 0, $productType);
+//                        $this->gongFuDistribution($order, $order['product_id'], $v['product_attr_unique'], 0, $productType);
 
                         if ($order['product_id'] == 15323) {
                             Db::name('activation_code')
@@ -9473,7 +9473,7 @@ class StoreOrderRepository extends BaseRepository
                 }
 
             }
-
+            $ds = 1;
         }
 
 
@@ -9481,7 +9481,7 @@ class StoreOrderRepository extends BaseRepository
 
         if ($comm_order_type == 3) {
             $name = '直推奖';
-            $ds = 1;
+
         } else if ($comm_order_type == 5) {
             $name = '养老金';
             //$user_bill_status = Db::name('store_order')->where("order_id",$order_id)->update(['gzc'=>1]);

app/controller/api/Notify.php

@@ -4,6 +4,7 @@ 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\StoreOrderRepository;
 use app\common\repositories\store\order\StoreRefundOrderRepository;
 use app\common\repositories\system\merchant\MerchantRepository;
 use app\common\repositories\user\UserRepository;
@@ -190,152 +191,177 @@ class Notify
                                     //给推广者分配养老金
                                     //给推广者分配佣金
                                     // if ($user_data['spread_uid'] != 0) {
-                                    if ($user_data['uid'] > 611) {
                                         //查询下单用户上级身份
                                         $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
+                                        $StoreOrderRepository = app()->make(StoreOrderRepository::class);
+                                        $rate = $StoreOrderRepository->getUserGroupRate($spread_data['user_group']);
+                                    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'], 5, $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->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'], $ssf, $store_order_data['order_id'], 11, "推广精彩生活区商品赠送积分");
+                                        // //推广佣金
+                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 5, $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);
+                                    }
                                         //业务员或以上的推荐人等级
                                         //user_group=1是消费者 3%，2:业务员 5%，3:业务经理7%，4:初级合伙人9%，5:中级合伙人11%,6:高级合伙人13%，7：董事15%
-                                        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, 0.07,2);
-                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.07,2);
-                                                $score     = $spread_data['score'] + bcmul($pv, 0.07,2);
-
-
-                                                $yj_amount_90 = bcmul($pv, 0.07,2) * 0.9;
-                                                $fgj_amount_10 = bcmul($pv, 0.07,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, 0.09,2);
-                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.09,2);
-                                                $score     = $spread_data['score'] + bcmul($pv, 0.09,2);
-
-                                                $yj_amount_90 = bcmul($pv, 0.09,2) * 0.9;
-                                                $fgj_amount_10 = bcmul($pv, 0.09,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, 0.11,2);
-                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.11,2);
-                                                $score     = $spread_data['score'] + bcmul($pv, 0.11,2);
-
-
-                                                $yj_amount_90 = bcmul($pv, 0.11,2) * 0.9;
-                                                $fgj_amount_10 = bcmul($pv, 0.11,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, 0.13,2);
-                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.13,2);
-                                                $score     = $spread_data['score'] + bcmul($pv, 0.13,2);
-                                                // $yj_amount = $spread_data['brokerage_price'] + round($pv * 0.13,2);
-
-                                                $yj_amount_90 = bcmul($pv, 0.13,2) * 0.9;
-                                                $fgj_amount_10 = bcmul($pv, 0.13,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, 0.15,2);
-                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.15,2);
-                                                $score     = $spread_data['score'] + bcmul($pv, 0.15,2);
-                                                // $yj_amount = $spread_data['brokerage_price'] + round($pv * 0.15,2);
-
-                                                $yj_amount_90 = bcmul($pv, 0.15,2) * 0.9;
-                                                $fgj_amount_10 = bcmul($pv, 0.15,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, 0.17,2);
-                                                $con       = $spread_data['contribute'] + bcmul($pv * 0.17,2);
-                                                $score     = $spread_data['score'] + bcmul($pv, 0.17,2);
-                                                // $yj_amount = $spread_data['brokerage_price'] + round($pv * 0.17,2);
-
-                                                $yj_amount_90 = bcmul($pv, 0.17,2) * 0.9;
-                                                $fgj_amount_10 = bcmul($pv, 0.17,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'],round($pv * 0.05,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'推广获得养老金'.round($pv * 0.05,2),$store_order_data['mer_id'],0);
-                                        }
+//                                        if($spread_data['user_group'] > 1){
+//
+//                                            // //给推广者分配佣金
+//                                            $yj_amount = 0;
+//                                            $ylj_amount = $spread_data['annuity'] + bcmul($pv, $rate,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, 0.09,2);
+//                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.09,2);
+//                                                $score     = $spread_data['score'] + bcmul($pv, 0.09,2);
+//
+//                                                $yj_amount_90 = bcmul($pv, 0.09,2) * 0.9;
+//                                                $fgj_amount_10 = bcmul($pv, 0.09,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, 0.11,2);
+//                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.11,2);
+//                                                $score     = $spread_data['score'] + bcmul($pv, 0.11,2);
+//
+//
+//                                                $yj_amount_90 = bcmul($pv, 0.11,2) * 0.9;
+//                                                $fgj_amount_10 = bcmul($pv, 0.11,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, 0.13,2);
+//                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.13,2);
+//                                                $score     = $spread_data['score'] + bcmul($pv, 0.13,2);
+//                                                // $yj_amount = $spread_data['brokerage_price'] + round($pv * 0.13,2);
+//
+//                                                $yj_amount_90 = bcmul($pv, 0.13,2) * 0.9;
+//                                                $fgj_amount_10 = bcmul($pv, 0.13,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, 0.15,2);
+//                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.15,2);
+//                                                $score     = $spread_data['score'] + bcmul($pv, 0.15,2);
+//                                                // $yj_amount = $spread_data['brokerage_price'] + round($pv * 0.15,2);
+//
+//                                                $yj_amount_90 = bcmul($pv, 0.15,2) * 0.9;
+//                                                $fgj_amount_10 = bcmul($pv, 0.15,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, 0.17,2);
+//                                                $con       = $spread_data['contribute'] + bcmul($pv * 0.17,2);
+//                                                $score     = $spread_data['score'] + bcmul($pv, 0.17,2);
+//                                                // $yj_amount = $spread_data['brokerage_price'] + round($pv * 0.17,2);
+//
+//                                                $yj_amount_90 = bcmul($pv, 0.17,2) * 0.9;
+//                                                $fgj_amount_10 = bcmul($pv, 0.17,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'],round($pv * 0.05,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'推广获得养老金'.round($pv * 0.05,2),$store_order_data['mer_id'],0);
+//                                        }
 
                                         //普通用户推广人
-                                        if($spread_data['user_group'] == 1){
-                                            //给推广者分配佣金
-                                            // $ylj_amount = $spread_data['annuity'] + round($pv * 0.3,2);
-                                            // $yj_amount_90 = round($pv * 0.21,2) * 0.9;
-                                            $yj_amount_90 = bcmul($pv, 0.3,2) * 0.9;
-                                            // $fgj_amount_10 = round($pv * 0.21,2) * 0.1;//推广者的佣金抽10%到个人复购金
-                                            $fgj_amount_10 = bcmul($pv, 0.3,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, 0.3,2);
-                                            $score = $spread_data['score'] + bcmul($pv, 0.3,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'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送贡献值");
-                                            $this->score_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送积分");
-
-
-
-                                        }
-
-
-
-                                    }
+//                                        if($spread_data['user_group'] == 1){
+//                                            //给推广者分配佣金
+//                                            // $ylj_amount = $spread_data['annuity'] + round($pv * 0.3,2);
+//                                            // $yj_amount_90 = round($pv * 0.21,2) * 0.9;
+//                                            $yj_amount_90 = bcmul($pv, 0.3,2) * 0.9;
+//                                            // $fgj_amount_10 = round($pv * 0.21,2) * 0.1;//推广者的佣金抽10%到个人复购金
+//                                            $fgj_amount_10 = bcmul($pv, 0.3,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, 0.3,2);
+//                                            $score = $spread_data['score'] + bcmul($pv, 0.3,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'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送贡献值");
+//                                            $this->score_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送积分");
+//
+//
+//
+//                                        }
 
                                     //锁客收益
                                     if($user_data['mer_id'] != 0){
@@ -1753,8 +1779,7 @@ class Notify
                     Db::name('gzc_logs')->insert($ylj_data_log);
 
                 }
-
-                
+                $ds = 1;
             }
            
         }

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

@@ -1897,17 +1897,17 @@ class StoreOrder extends BaseController
 //
 //            return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]);
 //        }
-        if ($groupOrder['pay_price'] == 0) {
-            $this->repository->paySuccess($groupOrder);
-            return app('json')->status('success', '支付成功2', ['order_id' => $groupOrder['group_order_id']]);
-        }
-        try {
-            $groupOrder['pay_price'] =set_price_rtrim($groupOrder['pay_price'] );
-            return app('json')->success(['order_id' => $groupOrder->group_order_id,"groupOrder"=>$groupOrder]);
-//            return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder);
-        } catch (\Exception $e) {
-            return app('json')->status('error', $e->getMessage(), ['order_id' => $groupOrder->group_order_id]);
-        }
+//        if ($groupOrder['pay_price'] == 0) {
+//            $this->repository->paySuccess($groupOrder);
+//            return app('json')->status('success', '支付成功2', ['order_id' => $groupOrder['group_order_id']]);
+//        }
+//        try {
+//            $groupOrder['pay_price'] =set_price_rtrim($groupOrder['pay_price'] );
+//            return app('json')->success(['order_id' => $groupOrder->group_order_id,"groupOrder"=>$groupOrder]);
+////            return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder);
+//        } catch (\Exception $e) {
+//            return app('json')->status('error', $e->getMessage(), ['order_id' => $groupOrder->group_order_id]);
+//        }
     }