Merge branch 'master' of https://git.bjtdba.com/shop/php

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

@@ -841,7 +841,7 @@ class OrderMerchantRepository extends BaseRepository
 //            $order->save();
             Db::name('order_merchant')->where('id', $order->id)->update(['binds' => 1, 'uid' => $user->uid]);
             //锁定商户
-            if (!$user->mer_id) {
+            if (!$user->mer_id || !$user->locktime) {
                 // $user->mer_id = $order->mer_id;
                 // $user->save();
                 Db::name('user')->where('uid', $user->uid)->update(['mer_id' => $order->mer_id, 'locktime' => date('Y-m-d H:i:s')]);
@@ -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无法入库 特此记录！']);
         }
@@ -1427,7 +1433,7 @@ class OrderMerchantRepository extends BaseRepository
             $bill = [
                 'uid'=>$top_data["spread_uid"],
                 'number'=>$tuijian_fugou,//数量
-                'status'=>-1,//复购金状态1-有效 0-失效 -1待确认
+                'status'=>1,//复购金状态1-有效 0-失效 -1待确认
                 'mark'=>"推荐人扫码消费赠送" . $tuijian_fugou . '复购金',//备注
                 'order_id'=>$order_id,//订单id
                 'surplus'=>0,//剩余
@@ -1437,6 +1443,9 @@ class OrderMerchantRepository extends BaseRepository
                 'addtime'=>time(),
             ];
             Db::name('user_sign_fugou')->insert($bill);
+            $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无法入库 特此记录！']);
         }
@@ -1481,7 +1490,7 @@ class OrderMerchantRepository extends BaseRepository
         //  商家京豆比例
         $mer_jd = $getMerchantContribution['jd'];
         //跨店分佣
-        $kd = 0.1;
+        $kd = 0.05;
         /**
          * 各自的比例结束
          */
@@ -1493,7 +1502,7 @@ class OrderMerchantRepository extends BaseRepository
         $merchant_user = $userRepository->getOne(['uid' => $mer_data["uid"]]);
 
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
-        $gongxian = bcmul($pv, $mer_gonxian, 2);
+        $gongxian = bcmul($divisible_commission, $mer_gonxian, 2);
         if ($gongxian >= 0.01) {
             $gongxian_data = [
                 "uid"           =>$mer_data["uid"],
@@ -1510,14 +1519,14 @@ 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无法入库 特此记录！']);
         }
 
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
-        $jd = bcmul($pv, $mer_jd, 2);
+        $jd = bcmul($divisible_commission, $mer_jd, 2);
         if ($jd >= 0.01) {
             $jd_data = [
                 "uid"           =>$mer_data["uid"],
@@ -1532,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 {
@@ -1542,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

@@ -1049,37 +1049,53 @@ class StoreOrderRepository extends BaseRepository
                             ];
                             $user_res_log = Db::name("user_sign_vr")->insert($log_data);
 
-                            //会员专区，给用户升级判断
-                            $orderList = Db::name("store_order")->where("uid", $uid)->where("mer_id", 496)->where("status", "in", [0, 1, 2, 3])->select();
-                            // 初始化总和变量
-                            $totalPayPrice = 0;
+                          
 
-                            // 遍历查询结果
-                            foreach ($orderList as $order) {
 
+                        } else if (!empty($array_fzone_paytype['type'] == 'a3')) {
 
-                                // 累加 pay_price
-                                $totalPayPrice += $order['pay_price'];
-                            }
-                            $userdata = Db::name("user")->where("uid", $uid)->find();
-
-                            if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
-
-                                if ($userdata['user_group'] <= 1) {
-                                    Db::name("user")->where("uid", $uid)->update(["user_group" => 2]);
-                                }
-
-                            } else if ($totalPayPrice >= 11800) {
-                                if ($userdata['user_group'] <= 2) {
-                                    Db::name("user")->where("uid", $uid)->update(["user_group" => 3]);
+                            //$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'] == 'a3')) {
-
-                            $paystage_status = 1;
-
                         } else if (!empty($array_fzone_paytype['type'] == 'c1')) {
                             //复购区 复购金支付
 
@@ -2228,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();
 
@@ -7705,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);
 
@@ -9843,51 +9859,34 @@ 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') {
+             //会员专区，给用户升级判断
+             $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;
 
-                //如果是用的VR支付，不是现金支付的情况下
-                if ($fzone_paytype['price'] <= 0.1) {
+             // 遍历查询结果
+             foreach ($orderList as $order) {
+                 // 累加 pay_price
+                 $totalPayPrice += $order['pay_price'];
+             }
 
-                    $dev_vr = $user_data['vr'] - $fzone_paytype['other'];
+             $userdata = Db::name("user")->where("uid", $store_order_data['uid'])->find();
 
-                    if ($dev_vr >= 0) {
-                        $user_data_dev_vr = Db::name('user')->where('uid', $store_order_data['uid'])->update(["vr" => $dev_vr]);
+             if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
 
-                        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 = [
+                 if ($userdata['user_group'] <= 1) {
+                     Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
+                 }
 
-                            '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);
-                    }
-
-                }
-
-
-            }
+             } else if ($totalPayPrice >= 11800) {
+                 if ($userdata['user_group'] <= 2) {
+                     Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
+                 }
+             }
 
 
         }

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);
 
                                         //养老金
@@ -676,6 +679,31 @@ class Notify
                                     
                                 }
 
+                                //会员专区，给用户升级判断
+                                $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'];
+                                }
+
+                                $userdata = Db::name("user")->where("uid", $store_order_data['uid'])->find();
+
+                                if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
+
+                                    if ($userdata['user_group'] <= 1) {
+                                        Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
+                                    }
+
+                                } else if ($totalPayPrice >= 11800) {
+                                    if ($userdata['user_group'] <= 2) {
+                                        Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
+                                    }
+                                }
+
 
                             }
 
@@ -1419,7 +1447,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/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/merchant/Taskorder.php

@@ -71,7 +71,9 @@ class Taskorder extends BaseController
   
     public function lst1()
     {
-     
+
+       
+     return;
         // $user_datas = Db::name("user")->select();//星级等级
         // foreach($user_datas as $k=>$v){
         //     if($v['user_level_id_old']==2){
@@ -87,18 +89,17 @@ class Taskorder extends BaseController
     
     //    var_dump($totalPv);return;    
     
-        $ss = $this->getbig_samll_datas(17);
-        var_dump($ss);
-  return;
+       //  $ss = $this->getbig_samll_datas(523);
+        // var_dump($ss);    return;
         // return;
      
         // $store_product_datas = Db::name('old_user_of_goods_old')->select();
        
         //$week_record = 45500 + 1400 + 60000; //20250218
-        $week_record =23800 + 60000; //20250222
-
+        //$week_record =23800 + 60000; //20250222
+        $week_record =64400; //20250301
    
-return;
+    //return;
 
        // $stock_comm = round($week_record * 0.05 ,2);
      //var_dump($week_record);return;
@@ -342,26 +343,31 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
 
         
 //die;
-              # code...
-              $all_award = $my_weight_money + $my_mix_money; 
+               # code...
+               $all_award = $my_weight_money + $my_mix_money; 
           
-              # code...
-             $res = Db::name("user")->where("uid",$v)->inc("total_amount_old",$all_award)->save();
+               //90%给佣金，10给复购金
+               $yj_90 = $all_award * 0.9;
+               $fg_10 = $all_award * 0.1;
+               # code...
+               $res = Db::name("user")->where("uid",$v)->inc("total_amount_old",$yj_90)->save();
+
+               Db::name("user")->where("uid",$v)->inc("amount_old",$yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
+               Db::name("user")->where("uid",$v)->inc("brokerage_price",$yj_90)->save();
 
-             Db::name("user")->where("uid",$v)->inc("amount_old",$all_award)->save();//不用冻结金额和提现额度来限制佣金发放
-             Db::name("user")->where("uid",$v)->inc("brokerage_price",$all_award)->save();
+               Db::name("user")->where("uid",$v)->inc("fugou",$fg_10)->save();
            
            
               
              //if($res) {
-                  $this->change_user_log($v,'amount_old',1,$all_award,"member_award","星级分红入账"."-".$value['title']);//释放佣金
+                  $this->change_user_log($v,'amount_old',1,$yj_90,"member_award","星级分红入账"."-".$value['title']);//释放佣金
                   //入账星级分红记录表
                   $week_data = [];
                   $week_data['user_id'] =  $v;
                   $week_data['user_star_id'] =  $key;
                   $week_data['award_num'] =  $my_weight_money;
                   $week_data['award_num_sm'] =  $my_mix_money;
-                  $week_data['remark'] =  "星级分红主动执行:" . $all_award;
+                  $week_data['remark'] =  "星级分红主动执行:" . $yj_90;
                   $week_data['week_record'] =  $week_record;
                   $week_data['all_amount'] =  $fs_money_nums;
                   $week_data['radio'] =  2;
@@ -372,8 +378,8 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
                   Db::name("old_user_weekaward")->insert($week_data);
 
 
-                  $this->bill_user_log111111($v,"合伙人分佣",$all_award,"合伙人分佣明细入账");//联创分佣明细2.0系统
-
+                  $this->bill_user_log111111($v,"合伙人分佣",$yj_90,"合伙人分佣明细入账",11);//联创分佣明细2.0系统
+                  $this->fugou_user_log($v,$fg_10,11,1,1);//复购金明细入账
               //}
           }
 
@@ -398,8 +404,32 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
 //     return [$mondayStart, $sundayEnd];
 // }
 
+
+    //添加复购金
+    public function fugou_user_log($uid,$num,$order_id,$type_inc_des,$status=-1){
+
+        $fugou_data = Db::name('user')->where("uid",$uid)->find();
+       
+
+        $bill = [
+            'uid'=>$uid,
+            'number'=>$num,//数量
+            'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
+            'mark'=>"复购金",//备注
+            'desc'=>"抽取佣金的10%作为复购金",//描述
+            'order_id'=>$order_id,//订单id
+            'surplus'=>0,//剩余
+            'order_type'=>11,//关联订单ID
+            'type'=>$type_inc_des,//复购金类型 :1赠送，2消耗
+            'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
+            'addtime'=>time(),
+        ];
+
+        Db::name('user_sign_fugou')->insert($bill);
+    }
+
   //添加平台分佣2.0系统收益明细日志(养老金金额)
-  public function bill_user_log111111($uid,$name,$num,$mark){
+  public function bill_user_log111111($uid,$name,$num,$mark,$comm){
 
     $con_data = Db::name('user')->where("uid",$uid)->find();
     //如果是会员专区就即刻到账
@@ -419,7 +449,7 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
         'mark'=>$mark,//备注
         'create_time'=>date('Y-m-d H:i:s'),//添加时间
         'status'=>1,//0待确定，1有效，-1无效
-        'commission_type'=>8,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
+        'commission_type'=>$comm,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
         //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
         //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
         'order_sn'=>0,//订单号
@@ -1232,14 +1262,46 @@ public function getbig_samll_datas($user_id) {
     //var_dump("小区业绩:".$get_teams_per_pv);
 
         //var_dump($team_amount, $person_amount);
-    // 计算大部门和小部门的汇总信息
-    $majorDepartmentSummary = [
-        "total_performance" =>  $get_teams_comm_pv +  $team_amount,
-    ];
+    // if($user_id == 523){
+    //     // 计算大部门和小部门的汇总信息
+    //     $majorDepartmentSummary = [
+    //         "total_performance" =>  0,
+    //     ];
+
+    //     $minorDepartmentSummary = [
+    //         "total_performance" => 7000,
+    //     ];
+
+    // }else if($user_id == 598){
+    //     // 计算大部门和小部门的汇总信息
+    //     $majorDepartmentSummary = [
+    //         "total_performance" =>  7000,
+    //     ];
+
+    //     $minorDepartmentSummary = [
+    //         "total_performance" => 7000,
+    //     ];
+    // }else{
+    //     // 计算大部门和小部门的汇总信息
+    //     $majorDepartmentSummary = [
+    //         "total_performance" =>  $get_teams_comm_pv +  $team_amount,
+    //     ];
+
+    //     $minorDepartmentSummary = [
+    //         "total_performance" => $get_teams_per_pv  + $person_amount,
+    //     ];
+    // }
+
+      // 计算大部门和小部门的汇总信息
+        $majorDepartmentSummary = [
+            "total_performance" =>  $get_teams_comm_pv +  $team_amount,
+        ];
 
-    $minorDepartmentSummary = [
-        "total_performance" => $get_teams_per_pv  + $person_amount,
-    ];
+        $minorDepartmentSummary = [
+            "total_performance" => $get_teams_per_pv  + $person_amount,
+        ];
+
+    
 
     // 返回所需的结果
     return [

app/controller/api/store/merchant/Taskorderguquan.php

@@ -22,7 +22,7 @@ class Taskorderguquan extends BaseController
     public function lst6()
     {
 
-        return;
+       return;
 
         // return;
 
@@ -30,7 +30,9 @@ class Taskorderguquan extends BaseController
 
         //$week_record = 45500 + 60000 + 1400;
 
-        $week_record = 23800 + 60000;//20250222
+        //$week_record = 23800 + 60000;//20250222
+
+        $week_record = 64400;//20250303
 
         $stock_comm = round($week_record * 0.05 ,2);
 
@@ -49,20 +51,25 @@ class Taskorderguquan extends BaseController
                 $v['allgetcomm'] =  $v['allgetcomm'] + $v['getcomm'];
                 $v['update_time'] = time();
 
-                // 更新 user_stock 表中的记录
+                $yj_90 = $v['getcomm'] * 0.9;
+                $fg_10 = $v['getcomm'] * 0.1;
+
+                // // 更新 user_stock 表中的记录
                 $res = db::name("old_user_stock")->where("id", $v['id'])->update([
                     'getcomm' => $v['getcomm'],
                     'allgetcomm' => $v['allgetcomm'],
                     'update_time' => $v['update_time']
                 ]);
 
-                Db::name("user")->where("uid",$v['user_id'])->inc("brokerage_price",$v['getcomm'])->save();
-                $res1 = Db::name("user")->where("uid",$v['user_id'])->inc("total_amount_old",$v['getcomm'])->save();
-                $res2 = Db::name("user")->where("uid",$v['user_id'])->inc("amount_old",$v['getcomm'])->save();
+               Db::name("user")->where("uid",$v['user_id'])->inc("brokerage_price", $yj_90)->save();
+               $res1 = Db::name("user")->where("uid",$v['user_id'])->inc("total_amount_old", $yj_90)->save();
+               $res2 = Db::name("user")->where("uid",$v['user_id'])->inc("amount_old", $yj_90)->save();
+
+               $res3 = Db::name("user")->where("uid",$v['user_id'])->inc("fugou", $fg_10)->save();
 
                 $res =true;
                 if($res){
-                    $das = $this->change_user_log($v['user_id'],'amount_old',1,$v['getcomm'],"member_award_stock","股权分红入账"."-".$v['pack']);//释放佣金
+                    $das = $this->change_user_log($v['user_id'],'amount_old',1, $yj_90,"member_award_stock","股权分红入账"."-".$v['pack']);//释放佣金
 
                     //入账星级分红记录表
                     $week_data = [];
@@ -79,18 +86,20 @@ class Taskorderguquan extends BaseController
                     $week_data['create_time'] = time();
 
 
-                   // Db::name("old_user_weekaward")->insert($week_data);
+                    Db::name("old_user_weekaward")->insert($week_data);
 
                     $userdatassss = db::name("old_user_jbp")->where("id",$v['user_id'])->find();
                     $datas_log = [
-                        'note'=>"名称:".  $userdatassss['nick_name']  . " 用户:".  $v['user_id'] . " 新增股权佣金:" . $v['getcomm'],
+                        'note'=>"名称:".  $userdatassss['nick_name']  . " 用户:".  $v['user_id'] . " 新增股权佣金:" .  $yj_90,
                         'create_time'=>date('Y-m-d H:i:s')
                     ];
                     $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
 
 
 
-                    $this->bill_user_log111111($v['user_id'],"股权分佣", $v['getcomm'],"股权明细入账");//股权分佣明细2.0系统
+                    $this->bill_user_log111111($v['user_id'],"股权分佣",  $yj_90,"股权明细入账",13);//股权分佣明细2.0系统
+
+                    $this->fugou_user_log($v['user_id'],$fg_10,11,1,1);//复购金明细入账
                 }
             }
         }
@@ -101,8 +110,31 @@ class Taskorderguquan extends BaseController
 
     }
 
+       //添加复购金
+       public function fugou_user_log($uid,$num,$order_id,$type_inc_des,$status=-1){
+
+        $fugou_data = Db::name('user')->where("uid",$uid)->find();
+       
+
+        $bill = [
+            'uid'=>$uid,
+            'number'=>$num,//数量
+            'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
+            'mark'=>"复购金",//备注
+            'desc'=>"抽取佣金的10%作为复购金",//描述
+            'order_id'=>$order_id,//订单id
+            'surplus'=>0,//剩余
+            'order_type'=>11,//关联订单ID
+            'type'=>$type_inc_des,//复购金类型 :1赠送，2消耗
+            'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
+            'addtime'=>time(),
+        ];
+
+        Db::name('user_sign_fugou')->insert($bill);
+    }
+
     //添加平台分佣2.0系统收益明细日志(养老金金额)
-    public function bill_user_log111111($uid,$name,$num,$mark){
+    public function bill_user_log111111($uid,$name,$num,$mark,$comm){
 
         $con_data = Db::name('user')->where("uid",$uid)->find();
         //如果是会员专区就即刻到账
@@ -122,7 +154,7 @@ class Taskorderguquan extends BaseController
             'mark'=>$mark,//备注
             'create_time'=>date('Y-m-d H:i:s'),//添加时间
             'status'=>1,//0待确定，1有效，-1无效
-            'commission_type'=>8,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
+            'commission_type'=>$comm,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
             //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
             //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
             'order_sn'=>0,//订单号

app/controller/api/store/merchant/Taskorderlianc.php

@@ -293,12 +293,13 @@ class Taskorderlianc extends BaseController
 
 
 
-//测试结束 以下是联创逻辑
+        //测试结束 以下是联创逻辑
         //return;
 
 
        // $week_record = 45500 + 1400 + 60000;
-        $week_record = 23800 +60000;
+        //$week_record = 23800 +60000;
+        $week_record = 64400;//20250303
 
         $originator_award = round(($week_record * 0.05),2);
 
@@ -306,6 +307,13 @@ class Taskorderlianc extends BaseController
         //return;
 
         $list = Db::name("user")->where("originator_id_old",">",0)->where("status",1)->field("uid,originator_id_old")->select()->toArray();
+
+        // foreach($list as $k=>$v){
+        //     var_dump($v);
+        // }
+
+        // return;
+
         $sum_money = Db::name("old_user_lianc")->sum("number");
 
         $lianc_list = Db::name("old_user_lianc")->order("id desc")->field("id,number,title")->select()->toArray();
@@ -352,35 +360,43 @@ class Taskorderlianc extends BaseController
                 # code...
                 $award = $value['people_award'];
 
-                Db::name("user")->where("uid",$v)->inc("brokerage_price",$award)->save();
-                $res = Db::name("user")->where("uid",$v)->inc("total_amount_old",$award)->save();
-                Db::name("user")->where("uid",$v)->inc("amount_old",$award)->save();//不用冻结金额和提现额度来限制佣金发放
-                
+                //90给佣金，10给复购金
+                $yj_90 = $award * 0.9;
+                $fg_10 = $award * 0.1;
+
+                Db::name("user")->where("uid",$v)->inc("brokerage_price",$yj_90)->save();
+                $res = Db::name("user")->where("uid",$v)->inc("total_amount_old",$yj_90)->save();
+                Db::name("user")->where("uid",$v)->inc("amount_old",$yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
+                $res3 = Db::name("user")->where("uid",$v)->inc("fugou", $fg_10)->save();
+
+
                 $res =true;
 
                 if($res) {
                   
 
-                    $$count  = $count +1;
-                    $this->change_user_log($v,'amount_old',1,$award,"relation_profits","联创分红入账"."-".$value['title']);
+                    $$count  = $count + 1;
+                    $this->change_user_log($v,'amount_old',1,$yj_90,"relation_profits","联创分红入账"."-".$value['title']);
                     //入账
                     $week_data = [];
                     $week_data['user_id'] =  $v;
                     $week_data['user_lianc_id'] =  $value['id'];
-                    $week_data['money'] =  $award;
+                    $week_data['money'] =  $yj_90;
                     $week_data['remark'] =  "联创分红入账主动执行";
                     $week_data['all_record'] =  $originator_award;
                     $week_data['all_amount'] =  $distribution_money;
                     $week_data['create_time'] = time();
                     Db::name("old_user_originator")->insert($week_data);
 
-                    $userdatassss = db::name("old_user_jbp")->where("id",$v)->find();
+                    $userdatassss = db::name("user")->where("uid",$v)->find();
                     $datas_log = [
-                        'note'=>"名称:".  $userdatassss['nick_name']  . " 用户:".  $v . " 新增联创佣金:" . $award,
+                        'note'=>"名称:".  $userdatassss['nickname']  . " 用户:".  $v . " 新增联创佣金:" . $yj_90,
                         'create_time'=>date('Y-m-d H:i:s')
                     ];
                     Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
-                    $this->bill_user_log111111($v,"联创分佣", $award,"联创明细入账");//股权分佣明细2.0系统
+                    $this->bill_user_log111111($v,"联创分佣", $yj_90,"联创明细入账",12);//股权分佣明细2.0系统
+                    
+                    $this->fugou_user_log($v,$fg_10,11,1,1);//复购金明细入账
 
                 }else {
                     // ..
@@ -393,8 +409,31 @@ class Taskorderlianc extends BaseController
 
     }
 
+        //添加复购金
+        public function fugou_user_log($uid,$num,$order_id,$type_inc_des,$status=-1){
+
+            $fugou_data = Db::name('user')->where("uid",$uid)->find();
+           
+    
+            $bill = [
+                'uid'=>$uid,
+                'number'=>$num,//数量
+                'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
+                'mark'=>"复购金",//备注
+                'desc'=>"抽取佣金的10%作为复购金",//描述
+                'order_id'=>$order_id,//订单id
+                'surplus'=>0,//剩余
+                'order_type'=>11,//关联订单ID
+                'type'=>$type_inc_des,//复购金类型 :1赠送，2消耗
+                'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
+                'addtime'=>time(),
+            ];
+    
+            Db::name('user_sign_fugou')->insert($bill);
+        }
+
     //添加平台分佣2.0系统收益明细日志(养老金金额)
-    public function bill_user_log111111($uid,$name,$num,$mark){
+    public function bill_user_log111111($uid,$name,$num,$mark,$comm){
 
         $con_data = Db::name('user')->where("uid",$uid)->find();
         //如果是会员专区就即刻到账
@@ -414,7 +453,7 @@ class Taskorderlianc extends BaseController
             'mark'=>$mark,//备注
             'create_time'=>date('Y-m-d H:i:s'),//添加时间
             'status'=>1,//0待确定，1有效，-1无效
-            'commission_type'=>8,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
+            'commission_type'=>$comm,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
             //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
             //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
             'order_sn'=>0,//订单号

app/controller/api/store/merchant/Taskorderyj.php

@@ -0,0 +1,148 @@
+<?php
+/**
+ * @package merchant
+ * @Author: Qinii
+ * @Date: 2020/5/28
+ */
+namespace app\controller\api\store\merchant;
+
+use think\App;
+use crmeb\basic\BaseController;
+use app\common\repositories\system\merchant\MerchantRepository as repository;
+use think\facade\Db;
+use think\facade\Log;
+use function Symfony\Component\VarDumper\Dumper\esc;
+
+class Taskorderyj extends BaseController
+{
+
+
+    public function lst7()
+    {
+
+        return;
+
+         //02050303补贴发放
+         $common_nums = [
+            62=>500,//李素红
+            192=>300,//刘银霞
+            39=>500,//周金花
+            133=>400,//隋彩云
+            186=>300,//黄金花
+            403=>300,//侯玉兰
+            294=>300,//王玲
+            43=>300,//徐立苹            
+            17=>500,//魏惠新
+            26=>400,//周行体
+            220=>300//孙贵萍
+        ];
+
+        // $common_nums = [
+        //     873=>500,//李素红
+        // ];
+
+        foreach($common_nums as $k=>$v){
+            // var_dump($k . " pri:" . $v);
+           
+            $yj_90 = $v * 0.9;
+            $fg_10 = $v * 0.1;
+
+            # code...
+            $res = Db::name("user")->where("uid",$k)->inc("total_amount_old",$yj_90)->save();
+
+            Db::name("user")->where("uid",$k)->inc("amount_old",$yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
+            Db::name("user")->where("uid",$k)->inc("brokerage_price",$yj_90)->save();
+            Db::name("user")->where("uid",$k)->inc("fugou", $fg_10)->save(); 
+
+
+            $userdatassss = db::name("user")->where("uid",$k)->find();    
+            
+            $datas_log = [
+             'note'=>"id:". $k." 昵称:" . $userdatassss['nickname'] . " pri:" . $yj_90,
+             'create_time'=>date('Y-m-d H:i:s')
+            ];
+
+            $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中    
+
+
+            $this->bill_user_log111111($k,"补贴",$yj_90,"系统补贴明细入账");//联创分佣明细2.0系统
+
+            $this->fugou_user_log($k,$fg_10,11,1,1);//复购金明细入账
+
+        }
+
+
+
+
+
+    }
+
+        //添加复购金
+        public function fugou_user_log($uid,$num,$order_id,$type_inc_des,$status=-1){
+
+            $fugou_data = Db::name('user')->where("uid",$uid)->find();
+           
+    
+            $bill = [
+                'uid'=>$uid,
+                'number'=>$num,//数量
+                'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
+                'mark'=>"复购金",//备注
+                'desc'=>"抽取佣金的10%作为复购金",//描述
+                'order_id'=>$order_id,//订单id
+                'surplus'=>0,//剩余
+                'order_type'=>11,//关联订单ID
+                'type'=>$type_inc_des,//复购金类型 :1赠送，2消耗
+                'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
+                'addtime'=>time(),
+            ];
+    
+            Db::name('user_sign_fugou')->insert($bill);
+        }
+
+      //添加平台分佣2.0系统收益明细日志(养老金金额)
+  public function bill_user_log111111($uid,$name,$num,$mark){
+
+    $con_data = Db::name('user')->where("uid",$uid)->find();
+    //如果是会员专区就即刻到账
+   
+    // Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
+   
+
+    $bill = [
+        'uid'=>$uid,
+        'link_id'=>0,//关联订单id
+        'pm'=>1,//0：支出，1：获得
+        'title'=>$name,//账单标题
+        'category'=>'now_money',//明细种类
+        'type'=>'commission',//明细类型
+        'number'=>$num,//明细数字
+        'balance'=>0,//剩余
+        'mark'=>$mark,//备注
+        'create_time'=>date('Y-m-d H:i:s'),//添加时间
+        'status'=>1,//0待确定，1有效，-1无效
+        'commission_type'=>8,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
+        //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
+        //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
+        'order_sn'=>0,//订单号
+        'tripartite'=>0,//
+        'type_shop'=>0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
+        'mer_id'=>0,//商户id
+        'source'=>0,//1线下 0线上
+        'order_type'=>1,//1自营  2 第三方  订单类型
+        'is_red_brokerage'=>0,//1红积分对冲佣金 0正常佣金
+        'gzc'=>3,//养老金是否已进入公证处log表0：未进入。1：已进入
+        'take_time'=>'',//结算时间
+        'district_id'=>'',//
+        'street_id'=>'',//
+        'month'=>'',//月份
+
+
+    ];
+
+    Db::name('user_bill')->insert($bill);
+}
+
+
+}
+  

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 = 17;
+        $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,38 +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']);
 
            $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 的记录总和（减去相应值后）
@@ -4037,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();
@@ -4049,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.');