Merge branch 'master' into huangfamily

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

@@ -1336,7 +1336,7 @@ class OrderMerchantRepository extends BaseRepository
 
         // 用户可以拿到的红包 红包：如果是1.0的老用户 pv的45%放到红包里面。14*45%=6.3元。直至金额满足1.0平台当前用户身份为止就不在反红包了
         $old_vip_limit = Db::name('user_sign_hongbao')->where('uid',$order["uid"])->sum('number') ?? 0;
-        if($user['is_old']==1 && $old_vip_limit >= $user['old_vip_limit']){
+        if($user['is_old']==1){
             //添加红包
             $hongbao=bcmul($pv, $yonghu_hongbao, 2);
             $hongbao_data = [
@@ -1353,7 +1353,9 @@ class OrderMerchantRepository extends BaseRepository
                 'settlement_time' => date('Y-m-d H:i:s')
             ];
             Db::name("user_sign_hongbao")->insert($hongbao_data);//添加记录
-            Db::name('user')->where('uid', $order["uid"])->inc('hongbao', (float)$hongbao)->update();
+            $user_hongbao = Db::name('user')->where('uid', $order["uid"])->value('hongbao');
+            $user_hongbao = bcadd($user_hongbao, (float)$hongbao,2);
+            Db::name('user')->where('uid', $order["uid"])->update(['hongbao'=>$user_hongbao]);
         }
 
         ///用户可以拿到PV等值的积分和贡献值
@@ -1373,7 +1375,9 @@ class OrderMerchantRepository extends BaseRepository
             $ins_data['order_type'] = $order_id;
             $ins_data['settlement_time'] = date('Y-m-d H:i:s');
             Db::name('user_sign_score')->insertGetId($ins_data);
-            Db::name('user')->where('uid', $order["uid"])->inc('score', (float)$pv)->update();
+            $user_score = Db::name('user')->where('uid', $order["uid"])->value('score');
+            $user_score = bcadd($user_score, (float)$pv,2);
+            Db::name('user')->where('uid', $order["uid"])->update(['score'=>$user_score]);
             //贡献值
             $gongxian_data = [
                 "uid"           =>$order["uid"],
@@ -1389,7 +1393,9 @@ class OrderMerchantRepository extends BaseRepository
                 'settlement_time' => date('Y-m-d H:i:s')
             ];
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-            Db::name('user')->where('uid', $order["uid"])->inc('contribute', (float)$pv)->update();
+            $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]);
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，积分和贡献值低于0.01无法入库 特此记录！']);
         }
@@ -1437,7 +1443,9 @@ class OrderMerchantRepository extends BaseRepository
                 'addtime'=>time(),
             ];
             Db::name('user_sign_fugou')->insert($bill);
-            Db::name('user')->where('uid', $order["uid"])->inc('fugou', (float)$tuijian_fugou)->update();
+            $user_fugou = Db::name('user')->where('uid', $top_data["spread_uid"])->value('fugou');
+            $user_fugou = bcadd($user_fugou, (float)$tuijian_fugou,2);
+            Db::name('user')->where('uid', $top_data["spread_uid"])->update(['fugou'=>$user_fugou]);
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的复购金比例较低，复购金低于0.01无法入库 特此记录！']);
         }
@@ -1482,7 +1490,7 @@ class OrderMerchantRepository extends BaseRepository
         //  商家京豆比例
         $mer_jd = $getMerchantContribution['jd'];
         //跨店分佣
-        $kd = 0.1;
+        $kd = 0.05;
         /**
          * 各自的比例结束
          */
@@ -1511,7 +1519,7 @@ class OrderMerchantRepository extends BaseRepository
                 "type"          =>1
             ];
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-            $merchant_user->contribute = $merchant_user->contribute + $pv;
+            $merchant_user->contribute = bcadd($merchant_user->contribute, (float)$gongxian,2);
             $merchant_user->save();
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
@@ -1533,7 +1541,7 @@ class OrderMerchantRepository extends BaseRepository
                 "surplus"       =>$jd,
                 "type"          =>1
             ];
-            $merchant_user->jingdou = $merchant_user->jingdou + $pv;
+            $merchant_user->jingdou = bcadd($merchant_user->jingdou, (float)$jd,2);
             $merchant_user->save();
             Db::name("user_sign_jingdou")->insert($jd_data);//添加记录
         } else {
@@ -1543,7 +1551,7 @@ class OrderMerchantRepository extends BaseRepository
         Db::name('log')->insert(['data' => 'PV:' . $pv .' mer_jd:'. $mer_jd.' mer_gonxian:'.$mer_gonxian.' jingdou:'.$merchant_user->jingdou.' contribute:'.$merchant_user->contribute]);
 
         //跨店
-        $kd_yongjin = bcmul($divisible_commission, $kd, 2);
+        $kd_yongjin = bcmul($pv, $kd, 2);
         if ($kd_yongjin >= 0.01) {
             $mer_uid = Db::name("merchant")->where("mer_id",$top_data["mer_id"])->find();
             if ($mer_uid){

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

@@ -1054,7 +1054,47 @@ class StoreOrderRepository extends BaseRepository
 
                         } else if (!empty($array_fzone_paytype['type'] == 'a3')) {
 
-                            $paystage_status = 1;
+                            //$paystage_status = 1;
+
+                            //在VR+现金支付的时候，如果用户直接用vr支付了，没有用到现金的情况，需要更改订单状态
+                            $userdatas = Db::name('user')->where('uid',$uid)->find();//
+                            //如果组合支付中，没有现金，只是用VR支付的情况下
+                            if($array_fzone_paytype['price'] <= 0){
+
+                               $total_vr = $userdatas['vr'] - $array_fzone_paytype['other'];
+
+                               if($total_vr >= 0){
+                                    $user_data_dev_vr =Db::name('user')->where('uid',$uid)->update(['vr'=>$total_vr]);//
+                                    if ($user_data_dev_vr) {
+                                        //支出账号存到log日志
+                                        $log_data = [
+                                            'uid' => $uid,
+                                            'number' => $array_fzone_paytype['other'],
+                                            'mark' => "购买会员专区商品消费VR:" . $array_fzone_paytype['other'],
+                                            'desc' => "VR",
+                                            'order_id' => 0,
+                                            'surplus' => $total_vr,
+                                            'order_type' => 0,
+                                            'type' => 2,
+                                            'addtime' => time()
+                                        ];
+                                        $user_res_log = Db::name("user_sign_vr")->insert($log_data);
+
+                                                    //修改订单状态
+                                        Db::name("store_order")->where("order_id",  $_order->order_id)->update(['paid' => 1, 'pay_time' => date('Y-m-d H:i:s'), 'status' => 0, 'distribution_mode' => 1]);
+                                        Db::name("store_group_order")->where("group_order_id", $groupOrder->group_order_id)->update(['paid' => 1, 'pay_time' => date('Y-m-d H:i:s')]);
+                                        $paystage_status = 1;
+
+                                    }else{
+                                        $log_data = [
+                                            'note' => "uid:" . $uid . " 购买会员专区商品消费VR:" . $array_fzone_paytype['other'] . " 用户消费前的VR余额:" .   $total_vr . "描述:" . "未扣成功!" . "备注:" . json_encode($array_fzone_paytype),
+                                            'create_time' => date("Y-m-d H:i:s", time())
+                                        ];
+
+                                        Db::name("test_log")->insert($log_data);
+                                    }
+                                }
+                            }
 
                         } else if (!empty($array_fzone_paytype['type'] == 'c1')) {
                             //复购区 复购金支付
@@ -2204,7 +2244,7 @@ class StoreOrderRepository extends BaseRepository
 
 
                 //throw new ValidateException($user_datas['vr']);
-                if ($uid == 7 || $uid == 669 || $uid == 670) {
+                if ($uid == 7 || $uid == 669 || $uid == 670 || $uid == 783 || $uid == 873 || $uid == 766 || $uid == 17 || $uid == 26) {
                     //如果选择组合支付，查询当前用户名下的VR
                     $user_datas = Db::name('user')->where('uid', $uid)->find();
 
@@ -7681,21 +7721,21 @@ class StoreOrderRepository extends BaseRepository
             //汇付分账
             if ($pay_type == 1) {
                 //微信
-                if ($order_group_data['pay_wx'] == 3) {
-                    $tdba_member_id = 'jsdk_member_wx21689732717371';//天地博爱科技公司
-                    $yihucha_member_id = 'jsdk_member_wx21700447226310';//河北省一壶茶电子商务有限公司
+                // if ($order_group_data['pay_wx'] == 3) {
+                    $tdba_member_id = 'jsdk_member_wx21689817115207';//天地博爱科技公司
+                    $yihucha_member_id = 'jsdk_member_wx21689817115207';//河北省一壶茶电子商务有限公司
                     $api_key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
-                } else {
-                    //废弃的
-                    $tdba_member_id = 'jsdk_member_wx1689731494604';
-                    $api_key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
-                    $yihucha_member_id = 'jsdk_member_wx1700272658386';
-                }
-            } else {
+                // } else {
+                //     //废弃的
+                //     $tdba_member_id = 'jsdk_member_wx1689731494604';
+                //     $api_key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
+                //     $yihucha_member_id = 'jsdk_member_wx1700272658386';
+                // }
+            } else {    
                 //支付宝
                 $api_key = 'api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
-                $tdba_member_id = 'jsdk_member_ali1689732721557';//天地博爱科技公司
-                $yihucha_member_id = 'jsdk_member_ali1700447230042';//河北省一壶茶电子商务有限公司
+                $tdba_member_id = 'jsdk_member_ali1689817119448';//天地博爱科技公司
+                $yihucha_member_id = 'jsdk_member_ali1689817119448';//河北省一壶茶电子商务有限公司
             }
             unset($div_members);
 
@@ -9819,51 +9859,9 @@ class StoreOrderRepository extends BaseRepository
             }
 
 
-            //会员专区用户如果是用的现金+VR。直接用VR付款的情况下。
-            $fzone_paytype = json_decode($store_order_data['fzone_paytype'], true);
-
-            $user_data = Db::name('user')->where('uid', $store_order_data['uid'])->find();
+           
 
-            //会员专区的现金+VR支付
-            if ($fzone_paytype['type'] == 'a3') {
-
-                //如果是用的VR支付，不是现金支付的情况下
-                if ($fzone_paytype['price'] <= 0.1) {
-
-                    $dev_vr = $user_data['vr'] - $fzone_paytype['other'];
-
-                    if ($dev_vr >= 0) {
-                        $user_data_dev_vr = Db::name('user')->where('uid', $store_order_data['uid'])->update(["vr" => $dev_vr]);
-
-                        if ($user_data_dev_vr) {
-                            //支出账号存到log日志
-                            $log_data = [
-                                'uid' => $user_data['uid'],
-                                'number' => $fzone_paytype['other'],
-                                'mark' => "购买会员专区商品消费VR:" . $fzone_paytype['other'],
-                                'desc' => "VR",
-                                'order_id' => 0,
-                                'surplus' => $dev_vr,
-                                'order_type' => 0,
-                                'type' => 2,
-                                'addtime' => time()
-                            ];
-                            $user_res_log = Db::name("user_sign_vr")->insert($log_data);
-                        }
-                    } else {
-                        $log_data = [
-
-                            'note' => "uid:" . $store_order_data['uid'] . " 购买会员专区商品消费VR:" . $fzone_paytype['other'] . " 用户消费前的VR余额:" . $user_data['vr'] . "描述:" . "未扣成功!" . "备注:" . json_encode($fzone_paytype),
-
-                            'create_time' => date("Y-m-d H:i:s", time())
-                        ];
-                        Db::name("test_log")->insert($log_data);
-                    }
-
-                }
-
-
-            }
+      
 
              //会员专区，给用户升级判断
              $orderList = Db::name("store_order")->where("uid", $store_order_data['uid'])->where("mer_id", 496)->where("status", "in", [0, 1, 2, 3])->select();

app/controller/admin/system/merchant/MerchantIntention.php

@@ -160,7 +160,8 @@ class MerchantIntention extends BaseController
 //            $commit_res=$this->repository->commit_res($shenhe_commit,$name);
 //            $commit_res=$this->repository->commit_res_query(['subApiKey'=>'api_live_2d788178-808b-4d73-bd9f-17c0d09cec44']);
 //            dump($commit_res);
-            $mer_id='276';
+            // $mer_id='276';
+            $mer_id = $id;
 
             $this -> repository -> huifu_create($id,1,'api_live_b3a56559-bb1a-42d0-89e2-b1d85e04a655','app_f3cba57b-15f3-4135-afda-ebe9fe3416ce',$mer_id);
             $this -> repository -> huifu_create($id,2,'api_live_68c25d10-2808-4042-8659-900e7b98ed1f','app_bd63b366-dbf1-4c66-97ef-a1438e9c935e',$mer_id);

app/controller/api/Auth.php

@@ -748,7 +748,8 @@ class Auth extends BaseController
         $data['vr']=set_price_rtrim($data['vr']);//购物金
         $data['hongbao']=set_price_rtrim($data['hongbao']);//红包
         $data['fugou']=set_price_rtrim($data['fugou']);//复购金
-        //$data['brokerage_price']=set_price_rtrim($data['brokerage_price']);//养老金
+        $data['brokerage_price']=set_price_rtrim($data['brokerage_price']);//养老金
+        $data['annuity'] = set_price_rtrim($data['annuity']);//养老金
         $a = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',3) -> where('status',0) -> sum('number');
         $b = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',3) -> where('status',1) -> sum('number');
         // $data['brokerage_price'] = $a +$b;
@@ -961,7 +962,7 @@ class Auth extends BaseController
     function curl_java_login($phone){
         $curl = curl_init();
         curl_setopt_array($curl, array(
-            CURLOPT_URL => 'http://testshop.hxxfb.com/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
+            CURLOPT_URL => 'http://shop.hxxfb.com/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_ENCODING => '',
             CURLOPT_MAXREDIRS => 10,

app/controller/api/Notify.php

@@ -463,7 +463,7 @@ class Notify
                                             //贡献值
                                             // $this->con_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
+                                            //$this->score_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
                                         }else if($spread_data['user_group'] == 3){
                                             $con = $spread_data['contribute'] + round($pv * 0.09,2);
@@ -473,7 +473,7 @@ class Notify
                                             //贡献值
                                             // $this->con_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
+                                            //$this->score_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                                         }else if($spread_data['user_group'] == 4){
@@ -484,7 +484,7 @@ class Notify
                                             //贡献值
                                             // $this->con_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
+                                           // $this->score_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                                         }else if($spread_data['user_group'] == 5){
@@ -495,7 +495,7 @@ class Notify
                                             //贡献值
                                             // $this->con_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
+                                           // $this->score_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
                                         }else if($spread_data['user_group'] == 6){
                                             $con = $spread_data['contribute'] + round($pv * 0.15,2);
@@ -505,7 +505,7 @@ class Notify
                                             //贡献值
                                             //$this->con_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
+                                           // $this->score_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                                         }else if($spread_data['user_group'] == 7){
@@ -516,11 +516,14 @@ class Notify
                                             //贡献值
                                             //$this->con_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                             //积分
-                                            $this->score_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
+                                            //$this->score_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                                         }
 
+                                        $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);
 
                                         //养老金
@@ -672,33 +675,35 @@ class Notify
                                         Db::name("test_log")->insert( $log_data);
                                     }
 
+                                    //$this->userupdates(userupdates);
                                     
                                 }
 
-                                //会员专区，给用户升级判断
-                                $orderList = Db::name("store_order")->where("uid", $store_order_data['uid'])->where("mer_id", 496)->where("status", "in", [0, 1, 2, 3])->select();
-                                // 初始化总和变量
-                                $totalPayPrice = 0;
+                              
+             //会员专区，给用户升级判断
+             $orderList = Db::name("store_order")->where("uid", $store_order_data['uid'])->where("mer_id", 496)->where("status", "in", [0, 1, 2, 3])->select();
+             // 初始化总和变量
+             $totalPayPrice = 0;
 
-                                // 遍历查询结果
-                                foreach ($orderList as $order) {
-                                    // 累加 pay_price
-                                    $totalPayPrice += $order['pay_price'];
-                                }
+             // 遍历查询结果
+             foreach ($orderList as $order) {
+                 // 累加 pay_price
+                 $totalPayPrice += $order['pay_price'];
+             }
 
-                                $userdata = Db::name("user")->where("uid", $store_order_data['uid'])->find();
+             $userdata = Db::name("user")->where("uid", $store_order_data['uid'])->find();
 
-                                if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
+             if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
 
-                                    if ($userdata['user_group'] <= 1) {
-                                        Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
-                                    }
+                 if ($userdata['user_group'] <= 1) {
+                     Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
+                 }
 
-                                } else if ($totalPayPrice >= 11800) {
-                                    if ($userdata['user_group'] <= 2) {
-                                        Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
-                                    }
-                                }
+             } else if ($totalPayPrice >= 11800) {
+                 if ($userdata['user_group'] <= 2) {
+                     Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
+                 }
+             }
 
 
                             }
@@ -911,6 +916,55 @@ class Notify
     }
 
     /**
+     * 获取当前用户业绩
+     */
+    public function userupdates($user_id) {
+      
+
+        $children = Db::name("user")
+        ->where("spread_uid", $user_id)
+        ->select(); // 获取子级的 uid 列表
+
+        $total_pv = 0;
+        
+        foreach($children as $k=>$v){
+            //$children_pv = Db::name("store_order")->where("uid", $v['uid'])->whereIn("status",[0,1,2,3])->select();
+            $children_pv = Db::name("user_sign_gongxian")->where("uid", $v['uid'])->where("status",1)->select();
+            foreach($children_pv as $k1=>$v1){
+                $total_pv += $v1['number'];
+            }
+           
+        }  
+        
+        $userdatas = Db::name("user")->where("uid", $user_id)->find();
+       // var_dump($userdatas['user_group']);
+        //如果当前用户是普通消费者的情况下
+        if($userdatas['user_group'] == 1){
+            if($total_pv != 0){
+             
+                if($total_pv >= 1180 && $total_pv < 11800){
+                
+                    Db::name("user")->where("uid", $user_id)->update(['user_group',2]);
+                }
+                
+            }
+        }
+
+        //如果当前用户是业务员消费者的情况下
+        if($userdatas['user_group'] <= 2){
+            if($total_pv != 0){
+             
+                if(11800 <= $total_pv){
+                 
+                   Db::name("user")->where("uid", $user_id)->update(['user_group',3]);
+                }
+                
+            }
+        }
+
+    }
+
+    /**
      * 会员升级
      */
     public function member_update($orderInfo,$goods_of_info,$user_id)
@@ -1394,7 +1448,54 @@ class Notify
         $con_data = Db::name('user')->where("uid",$uid)->find();
         //如果状态是1那就是即刻入账，
         if($status == 1){
-            $con_data_gongxian = Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+          
+
+            //如果当前用户是业务经理之前的等级，那么需要将当前用户的直推用户贡献值加到自己贡献值中去
+            if( $con_data['user_group'] <= 2 ){
+           
+                $spread_data = Db::name('user')->where("spread_uid",$uid)->select();
+             
+                if(count($spread_data) > 0){
+                    $all_ids = [];
+                    foreach($spread_data as $k=>$v){
+                        $all_ids[] = $v['uid'];
+                    }
+    
+                    // 查询当前用户及其子级的所有订单
+                    $orders = Db::name("store_order")
+                    ->whereIn('status', [0, 1, 2, 3])
+                    ->whereIn("uid", $all_ids)
+                    ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
+                    ->select();
+    
+                    // 计算总业绩
+                    $totalPv = 0;
+                    foreach ($orders as $order) {
+                        switch ($order['total_price']) {
+                        case 1180:
+                            $totalPv += 700;
+                            break;
+                        case 11800:
+                            $totalPv += 7000;
+                            break;
+                        case 10620:
+                            $totalPv += 6300;
+                            break;
+                        case 2360:
+                            $totalPv += 1400;
+                            break;
+                        case 9440:
+                            $totalPv += 5600;
+                            break;
+                        }
+                    }
+                    $con_data_gongxian = Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num , "per_contribute" => $totalPv]);
+                    
+                }
+            }else{
+                $con_data_gongxian = Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+            }
+
         }
 
         $con = [

app/controller/api/cron/CommissionCron.php

@@ -4,7 +4,9 @@
 namespace app\controller\api\cron;
 
 
+use AdaPaySdk\Drawcash;
 use AdaPaySdk\PaymentConfirm;
+use AdaPaySdk\SettleAccount;
 use app\common\dao\store\order\StoreOrderDao;
 use app\common\repositories\merchant\order\OrderGzcRepository;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
@@ -14,8 +16,10 @@ use app\common\repositories\user\UserRepository;
 use app\controller\api\Common;
 use app\controller\merchant\finance\Reconciliation;
 use app\traits\GongApiRequest;
+use app\traits\ShouxinyiApiRequest;
 use Carbon\Carbon;
 use Exception;
+use PHPMailer\PHPMailer\PHPMailer;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
 use think\db\exception\ModelNotFoundException;
@@ -1034,4 +1038,269 @@ where o.paid=1 and o.is_settlement=1 and settlement_time between '$this->startMo
         $merber->isError();
         return $merber->result;
     }
+
+
+
+
+    //服务器配置,一般是默认配置
+    private $CharSet = "UTF-8";                                  //设定邮件编码
+    private $SMTPDebug = 0;                                      // 调试模式输出
+    private $isSMTP = true;                                      // 使用SMTP
+    private $Host = 'smtp.163.com';                              // SMTP服务器
+    private $SMTPAuth = true;                                    // 允许 SMTP 认证
+    private $Username = 'username';                              // SMTP 用户名  即邮箱的用户名
+    private $Password = 'MHIKZOXVPTGNVOMU';                      // SMTP 密码  部分邮箱是授权码(例如163邮箱)
+    private $SMTPSecure = 'ssl';                                 // 允许 TLS 或者ssl协议
+    private $Port = 465;                                         // 服务器端口 25 或者465 具体要看邮箱服务器支持
+    //修改成自己的邮箱
+    private $From = 'formalverification@163.com';                //发件人邮箱
+    private $FromName = 'makalo';                                //发件人的用户昵称
+
+
+    //邮件对象
+    private $mail;
+
+    //一般只有用户名和密码还有端口会变动, 所以这三个参数可以创建对象动态指定，也可以直接写死
+    public function mallInit($Username = '', $Password = '', $Port = '')
+    {
+        if (!empty($Username)) {
+            $this->Username = $Username;
+        }
+        if (!empty($Password)) {
+            $this->Password = $Password;
+        }
+        if (!empty($Port)) {
+            $this->Port = $Port;
+        }
+
+        //为true表示启用异常
+        $mail = new PHPMailer(true);
+        //服务器配置
+        $mail->CharSet = $this->CharSet;                     //设定邮件编码
+        $mail->SMTPDebug = $this->SMTPDebug;                 // 调试模121212        1式输出
+
+        if ($this->isSMTP === true) {
+            $mail->isSMTP();                                 // 使用SMTP
+        }
+        $mail->Host = $this->Host;                           // SMTP服务器
+        $mail->SMTPAuth = $this->SMTPAuth;                   // 允许 SMTP 认证
+        $mail->Username = $this->Username;                   // SMTP 用户名  即邮箱的用户名
+        $mail->Password = $this->Password;                   // SMTP 密码  部分邮箱是授权码(例如163邮箱)
+        $mail->SMTPSecure = $this->SMTPSecure;               // 允许 TLS 或者ssl协议
+        $mail->Port = $this->Port;                           // 服务器端口 25 或者465 具体要看邮箱服务器支持
+        $mail->setFrom($this->From, $this->FromName);        //发件人
+
+        $this->mail = $mail;
+    }
+
+    /**
+    * 发送邮件
+    * @param array $sendAddress 收件人地址数组， 如果为单值数组则只写入收件地址，如果为键值数组则还写入收件人名称
+    * @param array $Attachment 附件数组，如果为单值数组则为添加附件，如果为键值数组则添加附件并且重命名
+    * @param bool $isHtml 是否以html文档格式发送
+    * @param string $Subject 邮件主题
+    * @param string $Body 邮件内容，如果以html格式可以写入html
+    * @param string $AltBody 如果为单值数组则只写入收件地址，如果为键值数组则还写入收件人名称
+    * @param array $CC 抄送地址数组， 如果为单值数组则只写入收件地址，如果为键值数组则还写入收件人名称
+    * @param array $BCC 密送地址数组，如果为单值数组则只写入收件地址，如果为键值数组则还写入收件人名称
+    * @return bool 是否发送成功
+    */
+    public function sendEMail($sendAddress = [], $Subject = '', $Body = '', $AltBody = '', $Attachment = [], $isHtml = true, $CC = [], $BCC = [])
+    {
+        try {
+            //必填参数校验
+            if (empty($sendAddress) || empty($Subject) || empty($Body)) {
+                return false;
+            }
+            //收件人
+            foreach ($sendAddress as $key => $value) {
+                if (is_int($key)) {
+                    // 处理单值
+                    $this->mail->addAddress($value);
+                } else {
+                    // 处理键值
+                    $this->mail->addAddress($value, $key);
+                }
+            }
+            //附件
+            if (!empty($Attachment)) {
+                foreach ($Attachment as $key => $value) {
+                    if (is_int($key)) {
+                        // 处理单值
+                        $this->mail->addAttachment($value);
+                    } else {
+                        // 处理键值
+                        $this->mail->addAttachment($value, $key);
+                    }
+                }
+            }
+            //抄送
+            if (!empty($CC)) {
+                //抄送不为空
+                foreach ($CC as $key => $value) {
+                    if (is_int($key)) {
+                        // 处理单值
+                        $this->mail->addCC($value);
+                    } else {
+                        // 处理键值
+                        $this->mail->addCC($value, $key);
+                    }
+                }
+            }
+            //密送
+            if (!empty($BCC)) {
+                //密送不为空
+                foreach ($BCC as $key => $value) {
+                    if (is_int($key)) {
+                        // 处理单值
+                        $this->mail->addBCC($value);
+                    } else {
+                        // 处理键值
+                        $this->mail->addBCC($value, $key);
+                    }
+                }
+            }
+
+            //回复的时候回复给哪个邮箱 建议和发件人一致
+            $this->mail->addReplyTo($this->From, $this->FromName);
+
+            //Content
+            // 是否以HTML文档格式发送  发送后客户端可直接显示对应HTML内容
+            $this->mail->isHTML($isHtml);
+            //邮件主题
+            $this->mail->Subject = $Subject;
+            //邮件内容
+            $this->mail->Body = $Body;
+            //如果邮件客户端不支持HTML则显示此内容
+            $this->mail->AltBody = $AltBody;
+
+            //发送
+            $this->mail->send();
+            return [
+                'code' => 200,
+            ];
+        } catch (\Exception $e) {
+            return [
+                'code'    => 400,
+                'message' => $this->mail->ErrorInfo
+            ];
+        }
+    }
+
+    public function take()
+    {
+        set_time_limit(0);
+        $this->mallInit('formalverification@163.com', 'SYECAWFLLTUPMDRP');
+        $this->sendEMail(['389123492@qq.com', '420132441@qq.com'], '结算定时', "开始执行" . date('Y-m-d H:i:s'), '如果邮件客户端不支持HTML则显示此内容');
+        $mallStr = '';
+
+//        Log::info('执行一次1 '.date('H:i') );
+//        return ;
+//        $storeOrderRepository = app()->make(StoreOrderRepository::class);
+        $key_list = [
+            1 => 'api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9',
+            2 => 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f',
+            3 => 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871'
+        ];
+        $appid_list = [
+            1 => 'app_44108546-d27a-48ee-88c1-84b45b75114f',
+            2 => 'app_0827b960-b932-45ec-b800-4e850091b419',
+            3 => 'app_383a75dd-c03d-44ab-8f58-92c60fe9b9d0'
+        ];
+//
+//        $payment_id = ShouxinyiApiRequest::getOrderNumber('split');
+//        $insertData = [
+//            [
+//                'mid'            => 0,
+//                'requestId'      => $payment_id,
+//                'group_order_id' => 'WX171955791230553863',
+//                'splitAmount'    => 0.25,
+//                'status'         => 0
+//            ],
+//        ];
+//        $div_members[] = [
+//            'member_id' => 'member_personal_16704641278422',
+//            'amount'    => '1.00',
+//            'fee_flag'  => 'Y'
+//        ];
+//        //////分账表
+//        Db::name("store_split_order")->insertAll($insertData);
+//        /// 分账表end
+//
+//        $params = [
+//            'payment_id'  => '002212024062814583210652657343702200320',
+//            'order_no'    => $payment_id,
+//            'confirm_amt' => '1.00',
+//            'div_members' => $div_members
+//        ];
+//
+//        $params['api_key'] = $key_list[3];
+//
+//        var_dump($params);
+//        Db::name("log")->insert(array('data' => '汇付延时分账参数-----' . json_encode($params)));//日志记录
+//        $res = $storeOrderRepository->payment_confirm_create_traits($params);
+//        Db::name("log")->insert(array('data' => '汇付延时分账-----' . json_encode($res)));//日志记录
+//        var_dump($res);
+//        // 分账
+//        return;
+
+        $merchant_member_list = Db::name('merchant_member')
+//            ->where('member_id', 'member_personal_16704641278422')
+            ->column('mer_id,type,member_id,settle_account_id');
+
+        foreach ($merchant_member_list as $merchant_member) {
+            $mer_id = $merchant_member['mer_id'];
+            if (empty($mer_id))
+                continue;
+            if (empty($merchant_member['settle_account_id']))
+                continue;
+            $params = [
+                'app_id'            => $appid_list[$merchant_member['type']],
+                'member_id'         => $merchant_member['member_id'],
+                'settle_account_id' => $merchant_member['settle_account_id'],
+                'api_key'           => $key_list[$merchant_member['type']]
+            ];
+            $merber = new SettleAccount();
+            $merber->balance($params);
+            $merber->result;
+//            var_dump($merber->result);
+            if (isset($merber->result[1])) {
+                $result = json_decode($merber->result[1], true);
+                $result = json_decode($result['data'], true);
+                $result['avl_balance'] = $result['avl_balance'] ?? 0;
+                if ($result['avl_balance'] > 0) {
+                    $payment_id = ShouxinyiApiRequest::getOrderNumber('split');
+                    $params = [
+                        'order_no'  => $payment_id,
+                        'app_id'    => $appid_list[$merchant_member['type']],
+                        'cash_type' => 'T1',
+                        'cash_amt'  => sprintf("%01.2f", $result['avl_balance']),
+                        'member_id' => $merchant_member['member_id'],
+                        'api_key'   => $key_list[$merchant_member['type']]
+                    ];
+
+                    $yanglao_member_ids = ['jsdk_member_wx21710232183139', 'jsdk_member_ali1710232187326'];
+                    if (in_array($merchant_member['member_id'], $yanglao_member_ids)) {
+                        $params['remark'] = '天地博爱科技～养老金';
+                    }
+
+                    Db::name("log")->insert(array('data' => '汇付取现参数-----' . json_encode($params)));//日志记录
+                    $merber = new Drawcash();
+                    $merber->create($params);
+                    # 返回查询结果
+                    $merber->isError();
+                    $res = $merber->result;
+                    Db::name("log")->insert(array('data' => '汇付延时分账-----' . json_encode($res)));                    //日志记录
+                    Db::name("log")->insert(array('data' => "mer_id {$mer_id} 请求分账{$result['avl_balance']}元-----"));//日志记录
+                    var_dump("mer_id {$mer_id} 请求分账{$result['avl_balance']}元-----");
+                    $mallStr = $mallStr . "-----mer_id {$mer_id} 请求分账{$result['avl_balance']}元-----<br/>";
+                }
+            }
+        }
+        echo date('Y-m-d H:i:s') . '执行结束' . "\r\n";
+
+
+        $this->sendEMail(['389123492@qq.com', '420132441@qq.com'], '结算定时', "执行结束<br/>" . $mallStr . date('Y-m-d H:i:s'), '如果邮件客户端不支持HTML则显示此内容');
+    }
+
 }

app/controller/api/merchant/order/OrderMerchant.php

@@ -275,13 +275,13 @@ class OrderMerchant extends BaseController
                 $member_id=Db::name('merchant_member')->where('mer_id',$order['mer_id']) ->where("type",3)->value('member_id');
                 $key='api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
                 $app_id='app_383a75dd-c03d-44ab-8f58-92c60fe9b9d0';
-                $member_70 = 'jsdk_member_wx21693792690420';
+                $member_70 = 'jsdk_member_wx21689817115207';
                 $member_20 = 'jsdk_member_wx21689817115207';
             }else{
                 $member_id=Db::name('merchant_member')->where('mer_id',$order['mer_id']) ->where("type",2)->value('member_id');
                 $key='api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
                 $app_id='app_0827b960-b932-45ec-b800-4e850091b419';
-                $member_70 = 'jsdk_member_wx1693641002355';
+                $member_70 = 'jsdk_member_wx1689758980590';
                 $member_20 = 'jsdk_member_wx1689758980590';
             }
 
@@ -306,7 +306,7 @@ class OrderMerchant extends BaseController
                 'buyer_id'=>$order['pay_user_id']
             ];
             $key='api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
-            $member_70 = 'jsdk_member_ali1693792697054';
+            $member_70 = 'jsdk_member_ali1689817119448';
             $member_20 = 'jsdk_member_ali1689817119448';
             // 天地博爱通道
 //            $app_id='app_0827b960-b932-45ec-b800-4e850091b419';

app/controller/api/merchant/sxy/Access.php

@@ -769,18 +769,40 @@ class Access
                 $userdata = Db::name('user')->where('uid',$store_order_data['uid'])->find();
                 //查询用户的VR是否足够
                 $vr_pri = $userdata['vr'] - $array_fzone_paytype['other'];
+
+               // return app('json')->fail($oid);
+                //return app('json')->fail($userdata['vr'] . " pri:" .$array_fzone_paytype['other']);
+
                 if($vr_pri < 0){
                     return app('json')->fail('VR不足，请重试!');
                 }
+
+                //如果VR足够，修改订单的实际价格
+                $group_order_datas = Db::name('store_group_order')->where('group_order_id',$oid)->find();
+                if(!empty($group_order_datas)){
+                    Db::name('store_group_order')->where('group_order_id',$oid)->update(['pay_price'=>$array_fzone_paytype['price']]);
+                }else{
+                    return app('json')->fail('找不到订单，请重试!');
+                }
             }
             //b2 精彩生活区的现金+积分支付
             if($array_fzone_paytype['type'] == 'b2'){
-
+                
+                $userdata = Db::name('user')->where('uid',$store_order_data['uid'])->find();
                 //查询用户的积分是否足够
                 $score_pri = $userdata['score'] - $array_fzone_paytype['other'];
                 if($score_pri < 0){
                     return app('json')->fail('积分不足，请重试!');
                 }
+
+                 //如果积分足够，修改订单的实际价格
+                 $group_order_datas = Db::name('store_group_order')->where('group_order_id',$oid)->find();
+                 if(!empty($group_order_datas)){
+                     Db::name('store_group_order')->where('group_order_id',$oid)->update(['pay_price'=>$array_fzone_paytype['price']]);
+                 }else{
+                     return app('json')->fail('找不到订单，请重试!');
+                 }
+
             }
 
 

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

@@ -560,6 +560,9 @@ class StoreOrder extends BaseController
 
             }else if(!empty($array_fzone_paytype['type'] == 'a3')){
                 //生活 现金 + VR支付
+                
+                
+               
             
                 //检查在旧表中是否有上级
                 if($userdatas['spread_old'] != 0){
@@ -567,7 +570,11 @@ class StoreOrder extends BaseController
                
                     //查询当前用户的上级在1.0中是有数据的，那么老用户介绍新用户。
                     $sf = Db::name('old_user_jbp')->where('id',$userdatas['uid'])->find();//父级在旧表有注册
+                    //如果组合支付中，没有现金，只是用VR支付的情况下
 
+                    if($array_fzone_paytype['price'] <= 0.01){
+                        return app('json')->fail("现金不足");
+                    }
  
                     // 当前用户是在2.0注册的新用户，父级是在1.0
 

app/controller/api/user/User.php

@@ -238,11 +238,23 @@ class User extends BaseController
         $user = $this->request->userInfo();
         if($user->uid>0){
 
-//            $dateObj=DB::name('user_sign_hongbao')->where('uid', $user->uid)->select();
+           // $dateObj=DB::name('user_sign_gongxian')->where('uid', $user->uid)->where("status",1)->select();
+            $con = DB::name('user')->where('uid', $user->uid)->find();
+            // $totalcon = 0;
+            // foreach($dateObj as $k=>$v){
+            //     $totalcon += $v['number'];
+            // }
             //已经入账贡献值
-            $data['total_source']=$user->contribute;
+            if( $con_data['user_group'] <= 2 ){
+                $data['total_source'] =  $con['contribute'] + $con['per_contribute'];
+            }else{
+                $data['total_source'] =  $con['contribute'];
+            }
+           
+            
+            $getteamscon = $this->getPerformance($user->uid);
             //我的团队贡献值
-            $data['team_gongxian_num']=$user->contribute;
+            $data['team_gongxian_num'] = $getteamscon['sum_nums_pv'];
 
             //为生贡献值
             $data['no_total_source']=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number');;
@@ -252,6 +264,32 @@ class User extends BaseController
         }
 
     }
+
+    //获取团队贡献值
+   public function gettemasconvalue($user_id) {
+     
+       //$user_id = 17;
+
+       $children = Db::name("user")
+       ->where("spread_uid", $user_id)
+       ->select(); // 获取子级的 uid 列表
+
+       $total_pv = 0;
+       
+       foreach($children as $k=>$v){
+           //$children_pv = Db::name("store_order")->where("uid", $v['uid'])->whereIn("status",[0,1,2,3])->select();
+           $children_pv = Db::name("user_sign_gongxian")->where("uid", $v['uid'])->where("status",1)->select();
+           foreach($children_pv as $k1=>$v1){
+               $total_pv += $v1['number'];
+           }
+          
+       }  
+
+     
+
+   }
+
+
     public function  gongxian_list(){
         $pm = $this->request->param('pm');
 
@@ -1365,14 +1403,16 @@ class User extends BaseController
 
 
         if($teamid == 592){
-             $teamid = 17;//593
+             $teamid = 593;//593
 
-            
+           // $ss=  $this->userupdates($teamid);
+           // var_dump($ss);
+                
 
                 $team_userinfo_old_jbp1 = $this->getPerformance22($teamid);
 
-           
-                var_dump($team_userinfo_old_jbp1);return;
+           //return;
+              var_dump($team_userinfo_old_jbp1);return;
         }
 
 
@@ -1998,7 +2038,7 @@ return app("json")->success($data);
         $data['yanglao_yugu_all'] = $data['yanglao_clear_all'] + $data['yanglao_nclear_all'];
         $where['uid'] = $uid;
         $data['totel_money'] = Db::name('user_bill')->where($where)
-            ->whereNotIn('commission_type', [5, 7, 17, 19])
+            ->whereNotIn('commission_type', [0, 5, 17, 19])
             ->when($commission_type == 5, function ($query) use ($where, $startMonth, $endMonth) {
                 $query->whereBetween('create_time', [$startMonth, $endMonth]);
             }, function ($query) use ($where, $month, $startMonth, $endMonth) {
@@ -2009,7 +2049,7 @@ return app("json")->success($data);
 
         $pageInfo = Db::name('user_bill')
             ->where($where)
-            ->whereNotIn('commission_type', [5, 7, 17, 19])
+            ->whereNotIn('commission_type', [0, 5, 17, 19])
             ->when($commission_type == 5, function ($query) use ($where, $startMonth, $endMonth) {
                 $query->whereBetween('create_time', [$startMonth, $endMonth]);
             }, function ($query) use ($where, $month, $startMonth, $endMonth) {
@@ -3217,15 +3257,15 @@ return app("json")->success($data);
         $data['sum_amount'] = Db::name('user_bill')
             ->where('uid', $uid)
             ->where('commission_type', '<>', 5)
+            ->where('commission_type', '<>', 0)
             ->where('pm', 1)
             ->sum('number');
 
-
-
         //未结算
         $data['no_clear_amount'] = Db::name('user_bill')
             ->where('uid', $uid)
             ->where('commission_type', '<>', 5)
+            ->where('commission_type', '<>', 0)
             ->where('pm', 1)
             ->where('status', 0)
             ->sum('number');
@@ -3243,7 +3283,7 @@ return app("json")->success($data);
         //最终 总收益是 = 佣金余额 + 已提现 + 已转VR
         $data['sum_amount'] = $data['sum_amount'] + $data['transition_vr_amount'];
 
-
+        $data['sum_amount'] = set_price_rtrim($data['sum_amount']);
         return app('json')->success($data);
     }
 
@@ -3692,7 +3732,7 @@ public function getparents_child_pv($user_id){
     $get_childs = Db::name("user")
     ->where("spread_uid", $user_id)
     ->column("uid");
-
+    //var_dump($get_childs);
     // 初始化总业绩和总人数
     $total_value = 0;
     $total_count = 0;
@@ -3701,13 +3741,16 @@ public function getparents_child_pv($user_id){
 
     // 遍历每个直接下级
     foreach ($get_childs as $child) {
+        //echo $child;
         // 获取当前下级及其子级
         $child_group = [$child];
         $recursive_children = $this->getRecursiveChildren($child);
         $child_group = array_merge($child_group, $recursive_children);
-
+//var_dump($child_group );
         // 获取当前分组的业绩和人数
         $result = $this->getteampv($child_group);
+
+        //var_dump($result);
         $group_pv = $result['totalPv'];
         $group_count = $result['totalUsers'];
 
@@ -3771,6 +3814,7 @@ function getRecursiveChildren_s($parentUid) {
      */
     public function userupdates($user_id) {
       
+        //$user_id = 17;
 
         $children = Db::name("user")
         ->where("spread_uid", $user_id)
@@ -3786,6 +3830,8 @@ function getRecursiveChildren_s($parentUid) {
             }
            
         }  
+
+        return $total_pv;
         
         $userdatas = Db::name("user")->where("uid", $user_id)->find();
        // var_dump($userdatas['user_group']);
@@ -3819,9 +3865,18 @@ function getRecursiveChildren_s($parentUid) {
      * 获取当前用户业绩
      */
     public function getPerformance22($user_id) {
+
+        $user_id = 593;
+        $con_data = Db::name('user')->where("uid",$user_id)->find();
+        //如果状态是1那就是即刻入账，
+     
+
+       
+return;
+
         $team_amount = 0;
         $person_amount = 0;
-        $user_id = 523; //598
+        $user_id = 598; //598 523
         
          $result_big_team_arr = [];
          $get_teams_comm_datas = [];//在2.0中获取父级下面的所有团队数据
@@ -3858,12 +3913,12 @@ function getRecursiveChildren_s($parentUid) {
             foreach ($filteredData as $array) {
                 $result_big_team_arr = array_merge($result_big_team_arr, $array);
             }
-         //var_dump($result_big_team_arr);
+            //var_dump($result_big_team_arr);
             //获取当前用户下面在2.0中的下级所有PV
             //$get_teams_comm_pv = $this->getteampv($result_big_team_arr);
             $t_pv = $this->getteampv($result_big_team_arr);
             $get_teams_comm_pv =$t_pv['totalPv'];
-            //var_dump($get_teams_comm_pv);
+            //var_dump($get_teams_comm_pv);echo "ttt";
 
             //获取当前用户下面在2.0中的下级所有人数
             $get_teams_comm_num = count($result_big_team_arr);
@@ -3919,7 +3974,7 @@ function getRecursiveChildren_s($parentUid) {
               
               
         }
-        
+        //var_dump($get_teams_comm_pv);
         //合并业绩和人数
         $team_amount += $get_teams_comm_pv;
            
@@ -3976,7 +4031,7 @@ function getRecursiveChildren_s($parentUid) {
         //var_dump($person_amount);
         //用户小部门所有在2.0系统下面的业绩和人数 end
 
-      
+      //var_dump($team_amount);
         // $common_nums[] = $user_id;
         foreach ($common_nums as $key => $value) {
             # code...
@@ -3988,7 +4043,8 @@ function getRecursiveChildren_s($parentUid) {
             $amount = $this->getPerformance1($value);
             $person_amount += $amount;
         }
-        //var_dump($team_amount);
+       // var_dump($team_amount);
+        //var_dump($person_amount);
 
         //
          
@@ -3998,39 +4054,39 @@ function getRecursiveChildren_s($parentUid) {
             //例子:17所有下面uid是speard_uid都是17的，和所有伞下的业绩。分出大小部门，加到1.0的大小部门中
             $b_s = $this->getparents_child_pv($user_id);
             
-            //var_dump( $b_s);echo "yyyyyyyyyyyyy";
+           // var_dump( $team_amount);echo "yyyyyyyyyyyyy";
             $team_amount += $b_s['team_pv'];
             $get_teams_comm_num += $b_s['team_num'];
- var_dump($b_s['team_pv']);
- var_dump($b_s['per_pv']);
+//   var_dump($b_s['team_pv']);
+//   var_dump($b_s['per_pv']);
 
            $person_amount += $b_s['per_pv'];
 
            $get_teams_per_num += $b_s['per_num'];//小部门人数
            //var_dump( $b_s['team_num'],$b_s['per_num']);
         }
-       
+       //var_dump($team_amount);
 
 
         $user_team_amount = Db::name("old_user_of_goods")->whereIn("user_id",$common_nums)->where("node_id",$user_id)->where('money', 1180)->select();
-
+    
         //$money1180Records = $this->old_user_of_goods->where('status', 1)->where('money', 1180)->select();
 // 计算 status 为 1 且 money 为 1180 的记录总和（减去相应值后）
         $money1180Sum = 0;
         foreach ($user_team_amount as $record) {
             $money1180Sum += $record['money'] - 300 - 180;
         }
-
+    //var_dump($money1180Sum );
 // 获取 status 为 1 且 money 为 11800 的记录集合
 
         $money11800Records = Db::name("old_user_of_goods")->whereIn("user_id",$common_nums)->where("node_id",$user_id)->where('money', 11800)->select();
-
+   
 // 计算 status 为 1 且 money 为 11800 的记录总和（减去相应值后）
         $money11800Sum = 0;
         foreach ($money11800Records as $record) {
             $money11800Sum += $record['money'] - 3000 - 1800;
         }
-
+//var_dump($money11800Sum );
         $money10620Records = Db::name("old_user_of_goods")->whereIn("user_id",$common_nums)->where("node_id",$user_id)->where('money', 10620)->select();
 
 // 计算 status 为 1 且 money 为 11800 的记录总和（减去相应值后）
@@ -4038,7 +4094,7 @@ function getRecursiveChildren_s($parentUid) {
         foreach ($money10620Records as $record) {
             $money10620Sum += $record['money'] - 2700 - 1620;
         }
-
+       // var_dump($money10620Sum );
 // 计算除去特定值后的总和
 //$otherMoneyRecords = $this->old_user_of_goods->where('status', 1)->whereNotIn('money', [1180, 11800])->select();
         $otherMoneyRecords = Db::name("old_user_of_goods")->whereIn("user_id",$common_nums)->where("node_id",$user_id)->whereNotIn('money', [1180, 11800 ,10620])->select();
@@ -4050,7 +4106,7 @@ function getRecursiveChildren_s($parentUid) {
 
 // 分别处理特定值的情况并加上其他值的总和
         $all_record_nums = $money1180Sum + $money11800Sum + $money10620Sum + round($otherMoneySum * 0.7,2);
-        // var_dump($all_record_nums);
+        //var_dump($all_record_nums);
         $team_amount += $all_record_nums;
        // var_dump($user_team_amount);
         //计算自己的个人联盟总流水

route/api.php

@@ -755,6 +755,9 @@ Route::group('api/', function () {
             //获取用户的可用VR
             Route::get('/product1/lst5', 'Taskordervr/lst5');
 
+             //补贴佣金发放
+             Route::get('/product1/lst7', 'Taskorderyj/lst7');
+
         })->prefix('api.store.merchant.');
 
 
@@ -1252,6 +1255,7 @@ Route::group('api/', function () {
     Route::get('down_gong_product', 'api.cron.CommissionCron/downGongProduct');//下架微唯宝已下架的商品
     Route::get('platform_income_detail_get', 'api.cron.CommissionCron/platform_income_detail_get');//插入平台收支明细
     Route::get('clear_platform_income_detail', 'api.cron.CommissionCron/clear_platform_income_detail');//删除平台收支明细
+    Route::get('take', 'api.cron.CommissionCron/take');//插入平台收支明细
     Route::get('order/group_detail/:id', 'api.store.order.StoreOrder/group_detail');//订单详情
     Route::get('commission_cron_bonus', 'api.cron.CommissionCron/bonus');