Merge branch 'master' into huangfamily

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

@@ -694,7 +694,7 @@ class StoreOrderRepository extends BaseRepository
 //                         $mer_money += $moneys - $total_extension_one - $souxufees;
 //                         if ($cartInfo['mer_id'] == 290) {
 //                             $moneys = bcsub($moneys, $souxufees, 3);
-//                             $moneys = round($moneys, 2);
+//                             $moneys = round($moneys, 2); 
 //                             $total_extension_one = bcmul($moneys, '0.52', 3);
 //                             $total_extension_one = round($total_extension_one, 2);
 //                             $mer_money = bcmul($moneys, '0.40', 3);
@@ -1025,7 +1025,7 @@ class StoreOrderRepository extends BaseRepository
                                 $le_yw_amount = 600;
                             }
 
-                            $ylj_pri = round($pv * 0.035, 2);
+                            $ylj_pri = bcmul($pv, 0.035, 2);
                             //$pv = round($pv * 0.35,2);
 
                             //分配养老金给消费者
@@ -2233,7 +2233,7 @@ class StoreOrderRepository extends BaseRepository
 
             if ($store_product_datas['mer_id'] == 496) {
 
-                $yanglao = round($num_yl * 0.035, 2);//给预下订单中的商品展示 养老金 显示作用
+                $yanglao = bcmul($num_yl, 0.035, 2);//给预下订单中的商品展示 养老金 显示作用
                 $cartInfo['list'][$_k]['yanglao'] = $yanglao;
                 $pv = $num_yl;
                 //$v['vr']=$v['price'];
@@ -2241,7 +2241,7 @@ class StoreOrderRepository extends BaseRepository
 
 
                 //throw new ValidateException($user_datas['vr']);
-                if ($uid == 7 || $uid == 669 || $uid == 670 || $uid == 783 || $uid == 873 || $uid == 766 || $uid == 17 || $uid == 26) {
+                // 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();
 
@@ -2273,38 +2273,38 @@ class StoreOrderRepository extends BaseRepository
                     }
 
 
-                } else {
-                    $cartInfo['list'][$_k]['fzone_paytype'] = [
+                // } else {
+                //     $cartInfo['list'][$_k]['fzone_paytype'] = [
 
-                        ['type' => 'a1', 'price' => $orderpri, 'other' => 0, 'note' => "VR"],//VR支付
-                        ['type' => 'a2', 'price' => $orderpri, 'other' => 0, 'note' => "现金"],//现金支付
-                        // ['type'=>'a3','price'=>$orderpri,'other'=>0,'note'=>"现金+VR"],//现金支付
-                    ];
-                }
+                //         ['type' => 'a1', 'price' => $orderpri, 'other' => 0, 'note' => "VR"],//VR支付
+                //         ['type' => 'a2', 'price' => $orderpri, 'other' => 0, 'note' => "现金"],//现金支付
+                //         // ['type'=>'a3','price'=>$orderpri,'other'=>0,'note'=>"现金+VR"],//现金支付
+                //     ];
+                // }
 
 
             } else if ($store_product_datas['mer_id'] == 439) {
 
 
                 //精彩生活和商贸区
-                $jf = $orderpri - round($store_product_datas['concession_pri'] * 0.3, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.3, 2);
-                $jd = $orderpri - round($store_product_datas['concession_pri'] * 0.35, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.35, 2);
+                $jf = $orderpri - bcmul($store_product_datas['concession_pri'], 0.3, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.3, 2);
+                $jd = $orderpri - bcmul($store_product_datas['concession_pri'], 0.35, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.35, 2);
                 if ($store_product_datas['concession_pri'] != null || $store_product_datas['concession_pri'] != 0) {
-                    $yanglao = round($store_product_datas['concession_pri'] * 0.3, 2);
-                    $pv = round($store_product_datas['concession_pri'] * 0.35, 2);
+                    $yanglao = bcmul($store_product_datas['concession_pri'], 0.3, 2);
+                    $pv = bcmul($store_product_datas['concession_pri'], 0.35, 2);
                     $srtArry['jfduihuan'] = $jf;
                     $srtArry['jdduihuan'] = $jd;
-                    $jifen = round($store_product_datas['concession_pri'] * 0.35, 2);
-                    $gongxian = round($store_product_datas['concession_pri'] * 0.35, 2);
-
-                    $jcvr = round($orderpri - round($store_product_datas['concession_pri'] * 0.3, 2), 2);
-                    $jcjf = round($store_product_datas['concession_pri'] * 0.3, 2);
-                    $jcprice = round($orderpri - round($store_product_datas['concession_pri'] * 0.3, 2), 2);
-                    $jcjf1 = round($store_product_datas['concession_pri'] * 0.3, 2);
-                    $jcvr1 = round($orderpri - round($store_product_datas['concession_pri'] * 0.35, 2), 2);
-                    $jcjd = round($store_product_datas['concession_pri'] * 0.35, 2);
-                    $jcprice1 = round($orderpri - round($store_product_datas['concession_pri'] * 0.35, 2), 2);
-                    $jcjd1 = round($store_product_datas['concession_pri'] * 0.35, 2);
+                    $jifen = bcmul($store_product_datas['concession_pri'], 0.35, 2);
+                    $gongxian = bcmul($store_product_datas['concession_pri'], 0.35, 2);
+
+                    $jcvr = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.3, 2), 2);
+                    $jcjf = bcmul($store_product_datas['concession_pri'], 0.3, 2);
+                    $jcprice = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.3, 2), 2);
+                    $jcjf1 = bcmul($store_product_datas['concession_pri'], 0.3, 2);
+                    $jcvr1 = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.35, 2), 2);
+                    $jcjd = bcmul($store_product_datas['concession_pri'], 0.35, 2);
+                    $jcprice1 = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.35, 2), 2);
+                    $jcjd1 = bcmul($store_product_datas['concession_pri'], 0.35, 2);
 
                     //var_dump($cartInfo['list'][$_k]);
                     //支付组合
@@ -2346,8 +2346,8 @@ class StoreOrderRepository extends BaseRepository
 //                $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
 //                $pv = $productSku['plate_mer_profit']??0.00;
                 //复购区
-                $pv = round($orderpri * 0.3, 2);
-                $yanglao = round($pv * 0.5, 2);//给预下订单中的商品展示 养老金 显示作用
+                $pv = bcmul($orderpri, 0.3, 2);
+                $yanglao = bcmul($pv, 0.5, 2);//给预下订单中的商品展示 养老金 显示作用
                 $cartInfo['list'][$_k]['pv'] = $pv;
                 $cartInfo['list'][$_k]['yanglao'] = $yanglao;
 
@@ -2362,24 +2362,24 @@ class StoreOrderRepository extends BaseRepository
                 $tmpMerchantInfo = $merchant->get($store_product_datas['mer_id']);
                 // 1企业2个体3个人
                 if ($tmpMerchantInfo && in_array($tmpMerchantInfo['type'], [2, 3])) {
-                    $jf = $orderpri - round($store_product_datas['concession_pri'] * 0.3, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.3, 2);
-                    $jd = $orderpri - round($store_product_datas['concession_pri'] * 0.35, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.35, 2);
+                    $jf = $orderpri - bcmul($store_product_datas['concession_pri'], 0.3, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.3, 2);
+                    $jd = $orderpri - bcmul($store_product_datas['concession_pri'], 0.35, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.35, 2);
                     if ($store_product_datas['concession_pri'] != null || $store_product_datas['concession_pri'] != 0) {
-                        $yanglao = round($store_product_datas['concession_pri'] * 0.3, 2);
-                        $pv = round($store_product_datas['concession_pri'] * 0.35, 2);
+                        $yanglao = bcmul($store_product_datas['concession_pri'], 0.3, 2);
+                        $pv = bcmul($store_product_datas['concession_pri'], 0.35, 2);
                         $srtArry['jfduihuan'] = $jf;
                         $srtArry['jdduihuan'] = $jd;
-                        $jifen = round($store_product_datas['concession_pri'] * 0.35, 2);
-                        $gongxian = round($store_product_datas['concession_pri'] * 0.35, 2);
-
-                        $jcvr = round($orderpri - round($store_product_datas['concession_pri'] * 0.3, 2), 2);
-                        $jcjf = round($store_product_datas['concession_pri'] * 0.3, 2);
-                        $jcprice = round($orderpri - round($store_product_datas['concession_pri'] * 0.3, 2), 2);
-                        $jcjf1 = round($store_product_datas['concession_pri'] * 0.3, 2);
-                        $jcvr1 = round($orderpri - round($store_product_datas['concession_pri'] * 0.35, 2), 2);
-                        $jcjd = round($store_product_datas['concession_pri'] * 0.35, 2);
-                        $jcprice1 = round($orderpri - round($store_product_datas['concession_pri'] * 0.35, 2), 2);
-                        $jcjd1 = round($store_product_datas['concession_pri'] * 0.35, 2);
+                        $jifen = bcmul($store_product_datas['concession_pri'], 0.35, 2);
+                        $gongxian = bcmul($store_product_datas['concession_pri'], 0.35, 2);
+
+                        $jcvr = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.3, 2), 2);
+                        $jcjf = bcmul($store_product_datas['concession_pri'], 0.3, 2);
+                        $jcprice = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.3, 2), 2);
+                        $jcjf1 = bcmul($store_product_datas['concession_pri'], 0.3, 2);
+                        $jcvr1 = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.35, 2), 2);
+                        $jcjd = bcmul($store_product_datas['concession_pri'], 0.35, 2);
+                        $jcprice1 = bcsub($orderpri, bcmul($store_product_datas['concession_pri'], 0.35, 2), 2);
+                        $jcjd1 = bcmul($store_product_datas['concession_pri'], 0.35, 2);
 
                         //var_dump($cartInfo['list'][$_k]);
                         //支付组合
@@ -3725,7 +3725,7 @@ class StoreOrderRepository extends BaseRepository
 
         $sanfangfenpei = json_decode($systemvalueObj['value'], true);
 
-        $oldagefee = round($order['total_price'] * $sanfangfenpei['yanglaojin'], 2);
+        $oldagefee = bcmul($order['total_price'], $sanfangfenpei['yanglaojin'], 2);
         log::info("++{$order['total_price']}+返回佣金===={$oldagefee}");
         //当前已扣会费总额
 //            $oldagefee = $oldagefee-$dues;
@@ -3745,7 +3745,7 @@ class StoreOrderRepository extends BaseRepository
         // 添加推荐奖励
         log::info("推荐佣金kaishi");
         //推荐养老金添加
-        $pvfee = round($order['total_price'] * $sanfangfenpei['pv'], 2);
+        $pvfee = bcmul($order['total_price'], $sanfangfenpei['pv'], 2);
         $zijiUser = Db::name("user")->where('uid', $order["uid"])->find();
         $sprerdUser = Db::name("user")->where('uid', $zijiUser['spread_uid'])->find();
         //不为空的时候进行添加推荐奖励
@@ -3756,7 +3756,7 @@ class StoreOrderRepository extends BaseRepository
             if ($sprerdUser["user_group"] > 1) {
                 //奖励推荐者养老金
                 //养老金比例是pv佣金的5%
-                $tuiguanyanglaojin = round($pvfee * 0.05, 2);
+                $tuiguanyanglaojin = bcmul($pvfee, 0.05, 2);
                 $tuimark = "推荐消费获得养老金" . $tuiguanyanglaojin;
 
                 //end会费
@@ -3804,7 +3804,7 @@ class StoreOrderRepository extends BaseRepository
                 $yongjinbili = 17;
             }
 
-            $tuiguanyongjin = round($pvfee * $yongjinbili / 100, 2);
+            $tuiguanyongjin = bcmul($pvfee, $yongjinbili / 100, 2);
 
 
             $tuiYongmark = "推荐消费获得佣金" . $tuiguanyongjin;
@@ -3863,7 +3863,7 @@ class StoreOrderRepository extends BaseRepository
         $sanfangfenpei = json_decode($systemvalueObj['value'], true);
 
         // @todo 消费者本人获得复购PV
-        $consumerRepurchaseareaestimateannuity = round($order['total_price'] * $sanfangfenpei['yanglaojin'], 2);
+        $consumerRepurchaseareaestimateannuity = bcmul($order['total_price'], $sanfangfenpei['yanglaojin'], 2);
         log::info("++{$order['total_price']}+返回佣金===={$consumerRepurchaseareaestimateannuity}");
         if ($consumerRepurchaseareaestimateannuity >= 0.01) {
             $this->add_bill(
@@ -3879,7 +3879,7 @@ class StoreOrderRepository extends BaseRepository
         $directThrustUserinfo = User::where('uid', $userinfo["spread_uid"])->find();
         if (!empty($directThrustUserinfo)) {
             // 直推养老金
-            $directThrustEstimateannuity = round($order['total_price'] * $sanfangfenpei['direct_thrust_ratio'], 2);
+            $directThrustEstimateannuity = bcmul($order['total_price'], $sanfangfenpei['direct_thrust_ratio'], 2);
             if ($directThrustEstimateannuity >= 0.01) {
                 $this->add_bill(
                     '养老金', $directThrustEstimateannuity, $directThrustUserinfo["uid"], "复购-直接推广者获得养老金" . $directThrustEstimateannuity,
@@ -3895,7 +3895,7 @@ class StoreOrderRepository extends BaseRepository
             $indirectThrustUserinfo = User::where('uid', $directThrustUserinfo["spread_uid"])->find();
             if (!empty($indirectThrustUserinfo)) {
                 // 间推养老金
-                $indirectThrustEstimateannuity = round($order['total_price'] * $sanfangfenpei['indirect_thrust_ratio'], 2);
+                $indirectThrustEstimateannuity = bcmul($order['total_price'], $sanfangfenpei['indirect_thrust_ratio'], 2);
                 if ($indirectThrustEstimateannuity >= 0.01) {
                     $this->add_bill(
                         '养老金', $indirectThrustEstimateannuity, $indirectThrustUserinfo["uid"], "复购-间接推广者获得养老金" . $indirectThrustEstimateannuity,
@@ -6698,25 +6698,29 @@ class StoreOrderRepository extends BaseRepository
                     }
                     $details = GongApiRequest::order_details($value['douhuomall_order_no']);
                     if (!$details) continue;
-                    $data['supply_type'] = $details['supply_type'];
+
+                    $track = GongApiRequest::order_track($value['douhuomall_order_no']);
+
+                    $data['supply_type'] = $details['supply_type'] ?? 0;
                     $data['delivery_type'] = 1;
-                    $data['delivery_name'] = $details['logistics_company'] ?? '';
-                    $data['delivery_id'] = $details['logistics_number'][0] ?? '';
+                    $data['delivery_name'] = $track['logistics'][0]['logistics_name'] ?? '';
+                    $data['delivery_id'] = $track['logistics'][0]['logistics_code'] ?? '';
                     $data['douhuomall_status'] = $details['status'];
                     if ($data['douhuomall_status'] == 3 && $value['status'] < 2) {
 //                        Db::name('log')->insert(['data'=>'微唯宝订单信息确认收货'.$value['order_id'].json_encode($order)]);
                         $data['status'] = 1;
+
                     } elseif ($data['douhuomall_status'] == 4 && ($value['status'] != 3 || $value['status'] != 4 || $value['status'] != 5)) {
                         //微唯宝订单状态已完成，并且平台状态不是已完成，申请退款，已退款
                         $data['status'] = 2;
                     } else {
                         $data['status'] = $value['status'];
-                    }
+                    }  
                     Db::name('store_order')->where('order_sn', $value['order_sn'])->update($data);
                     $s = [
                         'order_id' => $value['order_id'],
                         'douhuomall_order_no' => $value['douhuomall_order_no'],
-                        'supply_type' => $details['supply_type'],
+                        'supply_type' => $details['supply_type'] ?? 0,
                         'douhuomall_status' => $details['status']
                     ];
                     $this->douhuomall_order_s($value['douhuomall_order_no'], $s);
@@ -6754,9 +6758,10 @@ class StoreOrderRepository extends BaseRepository
 //            }
 //            $this -> dou_dc();
             Db::name('log')->insert(['data' => '微唯宝订单信息查询执行成功' . $i]);
-
+            echo '微唯宝订单信息查询执行成功';
         } catch (Exception $e) {
             Db::name('log')->insert(['data' => '供应链订单信息：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            echo $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】';
         }
     }
 
@@ -9225,7 +9230,7 @@ class StoreOrderRepository extends BaseRepository
 
 
     //添加贡献值日志
-    public function con_log($uid, $num, $order_id, $order_type, $mark, $status = -1)
+    public function con_log($uid, $num, $order_id, $order_type, $mark, $status = -1, $pv = 0)
     {
 
         $con_data = Db::name('user')->where("uid", $uid)->find();
@@ -9233,7 +9238,7 @@ class StoreOrderRepository extends BaseRepository
         if ($status == 1) {
             //$con_data_gongxian = Db::name('user')->where("uid", $uid)->update(['contribute' => $con_data['contribute'] + $num]);
             //如果当前用户是业务经理之前的等级，那么需要将当前用户的直推用户贡献值加到自己贡献值中去
-            if ($con_data['user_group'] <= 2) {
+            // if ($con_data['user_group'] <= 2) {
 
                 $spread_data = Db::name('user')->where("spread_uid", $uid)->select();
 
@@ -9283,24 +9288,25 @@ class StoreOrderRepository extends BaseRepository
 
                 // }
 
-            } else {
+            // } else {
 
-                // 检查是否包含“推广”
-                // if (strpos($mark, "推广") !== false) {
-                //     echo "字符串1包含'推广'\n";
-                // }
+            //     // 检查是否包含“推广”
+            //     // if (strpos($mark, "推广") !== false) {
+            //     //     echo "字符串1包含'推广'\n";
+            //     // }
 
-                // 检查是否包含“购买”
-                if (strpos($mark, "购买") !== false) {
-                    Db::name('user')->where("uid", $uid)->update(['contribute' => $con_data['contribute'] + $num]);
-                }
+            //     // 检查是否包含“购买”
+            //     if (strpos($mark, "购买") !== false) {
+            //         Db::name('user')->where("uid", $uid)->update(['contribute' => $con_data['contribute'] + $num]);
+            //     }
 
 
-            }
+            // }
         }
 
         $con = [
             'uid' => $uid,
+            'pv' => $pv,
             'number' => $num,//赠送数量
             'status' => $status,//红包状态
             'mark' => $mark,//备注
@@ -9535,8 +9541,8 @@ class StoreOrderRepository extends BaseRepository
                 $job_par = json_decode($store_order_data['fzone_paytype'], true);
                 //if($job_par['note'] == "现金"){
                 //普通消费者
-                $ylj_pri = round($concession_pri * 0.3, 2);
-                $pv = round($concession_pri * 0.35, 2);
+                $ylj_pri = bcmul($concession_pri, 0.3, 2);
+                $pv = bcmul($concession_pri, 0.35, 2);
 
                 //分配养老金给消费者
                 $ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
@@ -9565,18 +9571,18 @@ class StoreOrderRepository extends BaseRepository
 
                         // //给推广者分配佣金
                         $yj_amount = 0;
-                        $ylj_amount = $spread_data['annuity'] + round($pv * 0.05, 2);
+                        $ylj_amount = $spread_data['annuity'] + bcmul($pv, 0.05, 2);
                         $ssf = 0;//变量
                         $yj_amount_90 = 0;//90%的佣金
 
                         if ($spread_data['user_group'] == 2) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -9585,12 +9591,12 @@ class StoreOrderRepository extends BaseRepository
 
                             // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                         } else if ($spread_data['user_group'] == 3) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -9598,12 +9604,12 @@ class StoreOrderRepository extends BaseRepository
 
                             // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                         } else if ($spread_data['user_group'] == 4) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -9611,13 +9617,13 @@ class StoreOrderRepository extends BaseRepository
 
                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                         } else if ($spread_data['user_group'] == 5) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
                             // $yj_amount = $spread_data['brokerage_price'] + round($pv * $rate,2);
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -9625,12 +9631,12 @@ class StoreOrderRepository extends BaseRepository
 
                             // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                         } else if ($spread_data['user_group'] == 6) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -9638,13 +9644,13 @@ class StoreOrderRepository extends BaseRepository
 
                             // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                         } else if ($spread_data['user_group'] == 7) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -9658,17 +9664,17 @@ class StoreOrderRepository extends BaseRepository
                         //积分
                         $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "精彩生活区商品赠送积分");
                         // //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                         //养老金
-                        $this->bill_user_log($spread_data['uid'], round($pv * 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . round($pv * 0.05, 2), $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . bcmul($pv, 0.05, 2), $store_order_data['mer_id'], 0);
                     }
 
                     //普通用户推广人
                     if ($spread_data['user_group'] == 1) {
                         //给推广者分配佣金
 
-                        $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                        $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                        $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                         $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                         $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -9676,19 +9682,19 @@ class StoreOrderRepository extends BaseRepository
 
                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
 
-                        $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                        $score = $spread_data['score'] + round($pv * $rate, 2);
+                        $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                        $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
                         //贡献值和积分
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(["contribute"=>$con,"score"=>$score]);
 
                         //推广养老金
                         //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                         // 贡献值
-                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, $pv);
                         //积分
-                        $this->score_log($spread_data['uid'], round($pv * $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分");
+                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分");
                     }
                 }
 
@@ -9703,8 +9709,8 @@ class StoreOrderRepository extends BaseRepository
 
                         //给推广者分配佣金
 
-                        $yj_amount_90 = round($pv * 0.05, 2) * 0.9;
-                        $fgj_amount_10 = round($pv * 0.05, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $yj_amount_90 = bcmul($pv, 0.05, 2) * 0.9;
+                        $fgj_amount_10 = bcmul($pv, 0.05, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                         // $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
                         // $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
@@ -9713,7 +9719,7 @@ class StoreOrderRepository extends BaseRepository
 
                         // Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                         //推广佣金
-                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
 
                     }
 
@@ -9755,7 +9761,7 @@ class StoreOrderRepository extends BaseRepository
                 $le_yw_amount = 600;
             }
 
-            $ylj_pri = round($pv * 0.035, 2);
+            $ylj_pri = bcmul($pv, 0.035, 2);
             //$pv = round($pv * 0.35,2);
 
             //分配养老金给消费者
@@ -9767,8 +9773,8 @@ class StoreOrderRepository extends BaseRepository
 
             // Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,'contribute'=> $gxz_amount_mine,'score'=> $jf_amount_mine]);
 
-            $this->bill_user_log($user_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
-            $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1);
+            $this->bill_user_log($user_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . bcmul($pv, 0.035, 2), $store_order_data['mer_id']);
+            $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1, $pv);
             $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
 
             //查询下单用户上级身份（2.0新表用户）
@@ -9799,7 +9805,7 @@ class StoreOrderRepository extends BaseRepository
                     $con = 0;//贡献值
                     $score = 0;//积分
                     //养老金
-                    $uer_bill = $spread_data['annuity'] + round($pv * 0.035, 2);
+                    $uer_bill = $spread_data['annuity'] + bcmul($pv, 0.035, 2);
                     //$yongjin = $spread_data['brokerage_price'] + $le_yw_amount;
 
                     $yj_amount_90 = $le_yw_amount * 0.9;
@@ -9811,80 +9817,80 @@ class StoreOrderRepository extends BaseRepository
 
                     if ($spread_data['user_group'] == 2) {
 
-                        $con = $spread_data['contribute'] + round($pv * 0.07, 2);
-                        $score = $spread_data['brokerage_price'] + round($pv * 0.07, 2);
+                        $con = $spread_data['contribute'] + bcmul($pv, 0.07, 2);
+                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.07, 2);
                         //  Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
                         // $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'], bcmul($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);
-                        $score = $spread_data['brokerage_price'] + round($pv * 0.09, 2);
+                        $con = $spread_data['contribute'] + bcmul($pv, 0.09, 2);
+                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.09, 2);
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
                         // $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'], bcmul($pv, 0.09, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
 
 
                     } else if ($spread_data['user_group'] == 4) {
-                        $con = $spread_data['contribute'] + round($pv * 0.11, 2);
-                        $score = $spread_data['brokerage_price'] + round($pv * 0.11, 2);
+                        $con = $spread_data['contribute'] + bcmul($pv, 0.11, 2);
+                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.11, 2);
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
                         //$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'], bcmul($pv, 0.11, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
 
 
                     } else if ($spread_data['user_group'] == 5) {
-                        $con = $spread_data['contribute'] + round($pv * 0.13, 2);
-                        $score = $spread_data['brokerage_price'] + round($pv * 0.13, 2);
+                        $con = $spread_data['contribute'] + bcmul($pv, 0.13, 2);
+                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.13, 2);
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
                         // $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'], bcmul($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);
-                        $score = $spread_data['brokerage_price'] + round($pv * 0.15, 2);
+                        $con = $spread_data['contribute'] + bcmul($pv, 0.15, 2);
+                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.15, 2);
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
                         // $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'], bcmul($pv, 0.15, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
 
 
                     } else if ($spread_data['user_group'] == 7) {
-                        $con = $spread_data['contribute'] + round($pv * 0.17, 2);
-                        $score = $spread_data['brokerage_price'] + round($pv * 0.17, 2);
+                        $con = $spread_data['contribute'] + bcmul($pv, 0.17, 2);
+                        $score = $spread_data['brokerage_price'] + bcmul($pv, 0.17, 2);
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
                         //$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'], bcmul($pv, 0.17, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
 
 
                     }
                     Db::name('test_log')->insert(['note' => "走到这里4"]);//测试
                     //贡献值
-                    $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
+                    $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, $pv);
 
                     //养老金
-                    $this->bill_user_log($spread_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
+                    $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
                     //佣金
-                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
+                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id']);
                     //复购金
                     $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
 
@@ -9894,11 +9900,11 @@ class StoreOrderRepository extends BaseRepository
                 if ($spread_data['user_group'] == 1) {  
 
                     //获取贡献值和积分和佣金
-                    $gx_jf = $spread_data['contribute'] + round($pv * 0.21, 2);
+                    $gx_jf = $spread_data['contribute'] + bcmul($pv, 0.21, 2);
 
 
-                    $yj_amount_90 = round($yj1 * 0.9, 2);
-                    $fgj_amount_10 = round($yj1 * 0.1, 2);//推广者的佣金抽10%到个人复购金
+                    $yj_amount_90 = bcmul($yj1, 0.9, 2);
+                    $fgj_amount_10 = bcmul($yj1, 0.1, 2);//推广者的佣金抽10%到个人复购金
 
                     $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                     $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -9906,10 +9912,10 @@ class StoreOrderRepository extends BaseRepository
 
 
                     //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
-                    $this->con_log($spread_data['uid'], round($pv * 0.21, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
-                    $this->score_log($spread_data['uid'], round($pv * 0.21, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
+                    $this->con_log($spread_data['uid'], bcmul($pv, 0.21, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, $pv);
+                    $this->score_log($spread_data['uid'], bcmul($pv, 0.21, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
                     //推广佣金
-                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
+                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id']);
                 }
 
 
@@ -9919,7 +9925,7 @@ class StoreOrderRepository extends BaseRepository
                 $spread_data = Db::name('user')->where('uid', $spread_data_old['id'])->find();
                 //$spread_data = Db::name('user')->where('uid',473)->find();
                 //养老金
-                $uer_bill = $spread_data['annuity'] + round($pv * 0.035, 2);
+                $uer_bill = $spread_data['annuity'] + bcmul($pv, 0.035, 2);
 
 
                 $yj_amount_90 = $le_yw_amount * 0.9;
@@ -9928,11 +9934,11 @@ class StoreOrderRepository extends BaseRepository
                 $yongjin = $spread_data['brokerage_price'] + $yj_amount_90;
                 $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
 
-                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
+                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, $pv);
                 //养老金
-                $this->bill_user_log($spread_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . bcmul($pv, 0.035, 2), $store_order_data['mer_id']);
                 //佣金
-                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id']);
                 //复购金
                 $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
 
@@ -10004,8 +10010,8 @@ class StoreOrderRepository extends BaseRepository
                 if (!empty($merchant_data) && !empty($merchant_user_data)) {
 
 
-                    $yj_amount_90 = round($pv * 0.035, 2) * 0.9;
-                    $fgj_amount_10 = round($pv * 0.035, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                    $yj_amount_90 = bcmul($pv , 0.035, 2) * 0.9;
+                    $fgj_amount_10 = bcmul($pv, 0.035, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                     $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
                     $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
@@ -10014,7 +10020,7 @@ class StoreOrderRepository extends BaseRepository
 
                     // Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                     //推广佣金
-                    $this->bill_user_log($merchant_data['uid'], round($pv * 0.35, 2), $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . round($pv * 0.35, 2), $store_order_data['mer_id']);
+                    $this->bill_user_log($merchant_data['uid'], bcmul($pv, 0.35, 2), $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . round($pv * 0.35, 2), $store_order_data['mer_id']);
                 }
 
             }
@@ -10054,8 +10060,8 @@ class StoreOrderRepository extends BaseRepository
             // 1企业2个体3个人
             if ($merchantInfo && !empty($store_order_data) && in_array($merchantInfo['type'], [2, 3])) {
                 //商家让利部分的拆分
-                $ylj_pri = round($concession_pri * 0.3, 2); // 让利部分30%给消费者做养老金
-                $pv = round($concession_pri * 0.35, 2); // 35%做业绩PV分配
+                $ylj_pri = bcmul($concession_pri, 0.3, 2); // 让利部分30%给消费者做养老金
+                $pv = bcmul($concession_pri, 0.35, 2); // 35%做业绩PV分配
 
                 //分配养老金给消费者
                 $ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
@@ -10082,24 +10088,24 @@ class StoreOrderRepository extends BaseRepository
                         $yj_amount_90 = 0;//90%的佣金
                         // 业务员
                         if ($spread_data['user_group'] == 2) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
                             $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
                         } else if ($spread_data['user_group'] == 3) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -10107,12 +10113,12 @@ class StoreOrderRepository extends BaseRepository
 
                             // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                         } else if ($spread_data['user_group'] == 4) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -10120,13 +10126,13 @@ class StoreOrderRepository extends BaseRepository
 
                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                         } else if ($spread_data['user_group'] == 5) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
                             // $yj_amount = $spread_data['brokerage_price'] + round($pv * $rate,2);
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -10134,12 +10140,12 @@ class StoreOrderRepository extends BaseRepository
 
                             // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                         } else if ($spread_data['user_group'] == 6) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -10147,13 +10153,13 @@ class StoreOrderRepository extends BaseRepository
 
                             // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                         } else if ($spread_data['user_group'] == 7) {
-                            $ssf = round($pv * $rate, 2);
-                            $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                            $score = $spread_data['score'] + round($pv * $rate, 2);
+                            $ssf = bcmul($pv, $rate, 2);
+                            $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                            $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
 
-                            $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                            $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -10167,17 +10173,17 @@ class StoreOrderRepository extends BaseRepository
                         //积分
                         $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 12, "商贸区商品赠送积分");
                         //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                         //养老金
-                        $this->bill_user_log($spread_data['uid'], round($pv * 0.05, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '推广获得养老金' . round($pv * 0.05, 2), $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '推广获得养老金' . round($pv * 0.05, 2), $store_order_data['mer_id'], 0);
                     }
 
                     //普通用户推广人
                     if ($spread_data['user_group'] == 1) {
                         //给推广者分配佣金
 
-                        $yj_amount_90 = round($pv * $rate, 2) * 0.9;
-                        $fgj_amount_10 = round($pv * $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
+                        $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                         $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                         $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -10185,18 +10191,18 @@ class StoreOrderRepository extends BaseRepository
 
                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
 
-                        $con = $spread_data['contribute'] + round($pv * $rate, 2);
-                        $score = $spread_data['score'] + round($pv * $rate, 2);
+                        $con = $spread_data['contribute'] + bcmul($pv, $rate, 2);
+                        $score = $spread_data['score'] + bcmul($pv, $rate, 2);
 
                         //贡献值和积分
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(["contribute"=>$con,"score"=>$score]);
 
                         //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                         // 贡献值
                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
                         // 积分
-                        $this->score_log($spread_data['uid'], round($pv * $rate, 2), $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
+                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
                     }
                 }
 
@@ -10206,15 +10212,15 @@ class StoreOrderRepository extends BaseRepository
                     $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
                     if (!empty($merchant_user_data)) {
                         //给推广者分配佣金
-                        $yj_amount_90 = round($pv * 0.05, 2) * 0.9;
-                        $fgj_amount_10 = round($pv * 0.05, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $yj_amount_90 = bcmul($pv, 0.05, 2) * 0.9;
+                        $fgj_amount_10 = bcmul($pv, 0.05, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                         $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
                         $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
                         $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                         //推广佣金
-                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                     }
                     /** @var OrderMerchantRepository $orderMerchantRepository */
                     $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
@@ -10222,7 +10228,7 @@ class StoreOrderRepository extends BaseRepository
 
                     //商户获得贡献值
                     if ($concession_pri >= 0.01) {
-                        $gonxian = round($concession_pri * $jdAndGonxianConfig['gonxian'], 2);
+                        $gonxian = bcmul($concession_pri, $jdAndGonxianConfig['gonxian'], 2);
                         $gongxian_data = [
                             "uid" => $merchant_data["uid"],
                             "mer_id" => $user_data['mer_id'],
@@ -10244,7 +10250,7 @@ class StoreOrderRepository extends BaseRepository
 
                     //商户获得京豆
                     if ($concession_pri >= 0.01) {
-                        $jd = round($concession_pri * $jdAndGonxianConfig['jd'], 2);
+                        $jd = bcmul($concession_pri, $jdAndGonxianConfig['jd'], 2);
                         $jd_data = [
                             "uid" => $merchant_data["uid"],
                             "mer_id" => $user_data['mer_id'],
@@ -10307,7 +10313,7 @@ class StoreOrderRepository extends BaseRepository
 
 
         //code...
-        $pay_gb = round($orderInfo['num'] * $orderInfo['gb_num'], 2);
+        $pay_gb = bcmul($orderInfo['num'], $orderInfo['gb_num'], 2);
         //$pay_vr =  round($orderInfo['num'] * $orderInfo['vr_num'],2);
         //付款按照700的VR付款 start
         $vr_num = 0;
@@ -10340,17 +10346,17 @@ class StoreOrderRepository extends BaseRepository
 
             if ($goods_of_info['money'] == 1180) {
                 //修改订单到账状态
-                $zs_ylj = round(700 * 0.05, 2);//计算的养老金 金额
+                $zs_ylj = bcmul(700, 0.05, 2);//计算的养老金 金额
             } elseif ($goods_of_info['money'] == 11800) {
-                $zs_ylj = round(7000 * 0.05, 2);//计算的养老金 金额
+                $zs_ylj = bcmul(7000, 0.05, 2);//计算的养老金 金额
             } elseif ($goods_of_info['money'] == 3540) {
-                $zs_ylj = round(2100 * 0.05, 2);//计算的养老金 金额
+                $zs_ylj = bcmul(2100, 0.05, 2);//计算的养老金 金额
             } elseif ($goods_of_info['money'] == 10620) {
-                $zs_ylj = round(6300 * 0.05, 2);//计算的养老金 金额
+                $zs_ylj = bcmul(6300, 0.05, 2);//计算的养老金 金额
             } elseif ($goods_of_info['money'] == 9440) {
-                $zs_ylj = round(5600 * 0.05, 2);//八单计算的养老金 金额
+                $zs_ylj = bcmul(5600, 0.05, 2);//八单计算的养老金 金额
             } elseif ($goods_of_info['money'] == 2360) {
-                $zs_ylj = round(1400 * 0.05, 2);//两单计算的养老金 金额
+                $zs_ylj = bcmul(1400, 0.05, 2);//两单计算的养老金 金额
             }
 
 

app/common/repositories/store/product/ProductRepository.php

@@ -381,7 +381,7 @@ class ProductRepository extends BaseRepository
         $pric = $stock = $ot_price = $cost = $dc_price = $concession_pri = 0;
         if (isset($data['attrValue']) && is_array($data['attrValue'])) {
             foreach ($data['attrValue'] as $value) {
-
+                $value['extension_one'] = $value['extension_one'] ?? 0;
                 $value['cost'] = bcsub($value['price'], bcmul($value['price'], $value['extension_one'] / 100, 2), 2);
                 $value['gong_mer_profit'] = bcmul($value['price'], $value['extension_one'] / 100, 2);
                 $value['gong_market_price'] = bcadd($value['cost'], $value['gong_mer_profit'], 2);
@@ -1025,7 +1025,7 @@ class ProductRepository extends BaseRepository
                 $s = 8000;
             }
 
-            $res['yanglao'] = round($s * 0.035,2);
+            $res['yanglao'] = bcmul($s, 0.035, 2);  
         }
 
 
@@ -1701,8 +1701,8 @@ class ProductRepository extends BaseRepository
 
             if($product['mer_id'] == 496){
 
-                $yanglao = round($num_yl * 0.035, 2);
-                $pv=$num_yl *0.7;
+                $yanglao = bcmul($num_yl, 0.035, 2);
+                $pv = bcmul($num_yl, 0.7, 2);
                 //$v['vr']=$v['price'];
                 //1:为会员专区,
 
@@ -1715,24 +1715,24 @@ class ProductRepository extends BaseRepository
 
             }else if($product['mer_id'] == 439){
                 //精彩生活和商贸区
-                $jf = $product['price'] - round($product['concession_pri']*0.3, 2) . ' + ' . round($product['concession_pri']*0.3, 2);
-                $jd = $product['price'] - round($product['concession_pri']*0.35, 2) . ' + ' . round($product['concession_pri']*0.35, 2);
+                $jf = $product['price'] - bcmul($product['concession_pri'], 0.3, 2) . ' + ' . bcmul($product['concession_pri'],0.3, 2);
+                $jd = $product['price'] - bcmul($product['concession_pri'], 0.35, 2) . ' + ' . bcmul($product['concession_pri'],0.35, 2);
                 if($product['concession_pri'] !=null || $product['concession_pri'] !=0){
-                    $yanglao = round($product['concession_pri'] * 0.3, 2);
-                    $pv = round($product['concession_pri'] * 0.35, 2);
+                    $yanglao = bcmul($product['concession_pri'], 0.3, 2);
+                    $pv = bcmul($product['concession_pri'], 0.35, 2);
                     $srtArry['jfduihuan'] =$jf;
                     $srtArry['jdduihuan'] = $jd;
-                    $jifen = round($product['concession_pri'] * 0.35, 2);
-                    $gongxian = round($product['concession_pri'] * 0.35, 2);
+                    $jifen = bcmul($product['concession_pri'], 0.35, 2);
+                    $gongxian = bcmul($product['concession_pri'], 0.35, 2);
 
-                    $jcvr = $product['price'] - round($product['concession_pri']*0.3, 2);
-                    $jcjf = round($product['concession_pri']*0.3, 2);
-                    $jcprice = $product['price'] - round($product['concession_pri']*0.3, 2);
-                    $jcjf1 = round($product['concession_pri']*0.3, 2);
-                    $jcvr1 = $product['price'] - round($product['concession_pri']*0.35, 2);
-                    $jcjd = round($product['concession_pri']*0.35, 2);
-                    $jcprice1 = $product['price'] - round($product['concession_pri']*0.35, 2);
-                    $jcjd1 = round($product['concession_pri']*0.35, 2);
+                    $jcvr = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                    $jcjf = bcmul($product['concession_pri'], 0.3, 2);
+                    $jcprice = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                    $jcjf1 = bcmul($product['concession_pri'], 0.3, 2);
+                    $jcvr1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                    $jcjd = bcmul($product['concession_pri'], 0.35, 2);
+                    $jcprice1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                    $jcjd1 = bcmul($product['concession_pri'], 0.35, 2);
 
 
                     //支付组合
@@ -1764,7 +1764,7 @@ class ProductRepository extends BaseRepository
                 // 获取商品sku
                 $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
                 $pv = $productSku['plate_mer_profit']??0.00;
-                $yanglao = round($pv * 0.5, 2);
+                $yanglao = bcmul($pv, 0.5, 2);
                 //$v['vr']=$v['price'];
                 //1:为会员专区,
 
@@ -1783,24 +1783,24 @@ class ProductRepository extends BaseRepository
                 // 1企业2个体3个人
                 if ($merchantInfo && in_array($merchantInfo['type'],[2,3])) {
                     //商贸区
-                    $jf = $product['price'] - round($product['concession_pri']*0.3, 2) . ' + ' . round($product['concession_pri']*0.3, 2);
-                    $jd = $product['price'] - round($product['concession_pri']*0.35, 2) . ' + ' . round($product['concession_pri']*0.35, 2);
+                    $jf = $product['price'] - bcmul($product['concession_pri'],0.3, 2) . ' + ' . bcmul($product['concession_pri'],0.3, 2);
+                    $jd = $product['price'] - bcmul($product['concession_pri'],0.35, 2) . ' + ' . bcmul($product['concession_pri'],0.35, 2);
                     if($product['concession_pri'] !=null || $product['concession_pri'] !=0){
-                        $yanglao = round($product['concession_pri'] * 0.3, 2);
-                        $pv = round($product['concession_pri'] * 0.35, 2);
+                        $yanglao = bcmul($product['concession_pri'], 0.3, 2);
+                        $pv = bcmul($product['concession_pri'], 0.35, 2);
                         $srtArry['jfduihuan'] =$jf;
                         $srtArry['jdduihuan'] = $jd;
-                        $jifen = round($product['concession_pri'] * 0.35, 2);
-                        $gongxian = round($product['concession_pri'] * 0.35, 2);
-
-                        $jcvr = $product['price'] - round($product['concession_pri']*0.3, 2);
-                        $jcjf = round($product['concession_pri']*0.3, 2);
-                        $jcprice = $product['price'] - round($product['concession_pri']*0.3, 2);
-                        $jcjf1 = round($product['concession_pri']*0.3, 2);
-                        $jcvr1 = $product['price'] - round($product['concession_pri']*0.35, 2);
-                        $jcjd = round($product['concession_pri']*0.35, 2);
-                        $jcprice1 = $product['price'] - round($product['concession_pri']*0.35, 2);
-                        $jcjd1 = round($product['concession_pri']*0.35, 2);
+                        $jifen = bcmul($product['concession_pri'], 0.35, 2);
+                        $gongxian = bcmul($product['concession_pri'], 0.35, 2);
+
+                        $jcvr = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                        $jcjf = bcmul($product['concession_pri'], 0.3, 2);
+                        $jcprice = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                        $jcjf1 = bcmul($product['concession_pri'], 0.3, 2);
+                        $jcvr1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                        $jcjd = bcmul($product['concession_pri'], 0.35, 2);
+                        $jcprice1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                        $jcjd1 = bcmul($product['concession_pri'], 0.35, 2);
 
                         $fzone_paytype= [
 //                ['type'=>'b1','price'=>$jcvr,'other'=>$jcjf],

app/controller/api/Notify.php

@@ -167,8 +167,8 @@ class Notify
                                     $job_par = json_decode($store_order_data['fzone_paytype'], true);
                                     //if($job_par['note'] == "现金"){
                                     //普通消费者
-                                    $ylj_pri = round($concession_pri * 0.3,2);
-                                    $pv = round($concession_pri * 0.35,2);
+                                    $ylj_pri = bcmul($concession_pri, 0.3,2);
+                                    $pv = bcmul($concession_pri, 0.35,2);  
 
                                     //分配养老金给消费者
                                     $ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
@@ -195,18 +195,18 @@ class Notify
 
                                             // //给推广者分配佣金
                                             $yj_amount = 0;
-                                            $ylj_amount = $spread_data['annuity'] + round($pv * 0.05,2);
+                                            $ylj_amount = $spread_data['annuity'] + bcmul($pv, 0.05,2);
                                             $ssf = 0;//变量
                                             $yj_amount_90 = 0;//90%的佣金
 
                                             if($spread_data['user_group'] == 2){
-                                                $ssf =round($pv * 0.07,2);
-                                                $con       = $spread_data['contribute'] + round($pv * 0.07,2);
-                                                $score     = $spread_data['score'] + round($pv * 0.07,2);
+                                                $ssf =bcmul($pv, 0.07,2);
+                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.07,2);
+                                                $score     = $spread_data['score'] + bcmul($pv, 0.07,2);
 
 
-                                                $yj_amount_90 = round($pv * 0.07,2) * 0.9;
-                                                $fgj_amount_10 = round($pv * 0.07,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                                $yj_amount_90 = bcmul($pv, 0.07,2) * 0.9;
+                                                $fgj_amount_10 = bcmul($pv, 0.07,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                                                 $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                                                 $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -216,12 +216,12 @@ class Notify
 
                                                 // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                                             }else if($spread_data['user_group'] == 3){
-                                                $ssf =round($pv * 0.09,2);
-                                                $con       = $spread_data['contribute'] + round($pv * 0.09,2);
-                                                $score     = $spread_data['score'] + round($pv * 0.09,2);
+                                                $ssf =bcmul($pv, 0.09,2);
+                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.09,2);
+                                                $score     = $spread_data['score'] + bcmul($pv, 0.09,2);
 
-                                                $yj_amount_90 = round($pv * 0.09,2) * 0.9;
-                                                $fgj_amount_10 = round($pv * 0.09,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                                $yj_amount_90 = bcmul($pv, 0.09,2) * 0.9;
+                                                $fgj_amount_10 = bcmul($pv, 0.09,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                                                 $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                                                 $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -229,13 +229,13 @@ class Notify
 
                                                 // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                                             }else if($spread_data['user_group'] == 4){
-                                                $ssf =round($pv * 0.11,2);
-                                                $con       = $spread_data['contribute'] + round($pv * 0.11,2);
-                                                $score     = $spread_data['score'] + round($pv * 0.11,2);
+                                                $ssf =bcmul($pv, 0.11,2);
+                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.11,2);
+                                                $score     = $spread_data['score'] + bcmul($pv, 0.11,2);
 
 
-                                                $yj_amount_90 = round($pv * 0.11,2) * 0.9;
-                                                $fgj_amount_10 = round($pv * 0.11,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                                $yj_amount_90 = bcmul($pv, 0.11,2) * 0.9;
+                                                $fgj_amount_10 = bcmul($pv, 0.11,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                                                 $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                                                 $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -243,13 +243,13 @@ class Notify
 
                                                 //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                                             }else if($spread_data['user_group'] == 5){
-                                                $ssf =round($pv * 0.13,2);
-                                                $con       = $spread_data['contribute'] + round($pv * 0.13,2);
-                                                $score     = $spread_data['score'] + round($pv * 0.13,2);
+                                                $ssf =bcmul($pv, 0.13,2);
+                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.13,2);
+                                                $score     = $spread_data['score'] + bcmul($pv, 0.13,2);
                                                 // $yj_amount = $spread_data['brokerage_price'] + round($pv * 0.13,2);
 
-                                                $yj_amount_90 = round($pv * 0.13,2) * 0.9;
-                                                $fgj_amount_10 = round($pv * 0.13,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                                $yj_amount_90 = bcmul($pv, 0.13,2) * 0.9;
+                                                $fgj_amount_10 = bcmul($pv, 0.13,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                                                 $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                                                 $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -257,13 +257,13 @@ class Notify
 
                                                 // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                                             }else if($spread_data['user_group'] == 6){
-                                                $ssf =round($pv * 0.15,2);
-                                                $con       = $spread_data['contribute'] + round($pv * 0.15,2);
-                                                $score     = $spread_data['score'] + round($pv * 0.15,2);
+                                                $ssf =bcmul($pv, 0.15,2);
+                                                $con       = $spread_data['contribute'] + bcmul($pv, 0.15,2);
+                                                $score     = $spread_data['score'] + bcmul($pv, 0.15,2);
                                                 // $yj_amount = $spread_data['brokerage_price'] + round($pv * 0.15,2);
 
-                                                $yj_amount_90 = round($pv * 0.15,2) * 0.9;
-                                                $fgj_amount_10 = round($pv * 0.15,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                                $yj_amount_90 = bcmul($pv, 0.15,2) * 0.9;
+                                                $fgj_amount_10 = bcmul($pv, 0.15,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                                                 $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                                                 $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -271,13 +271,13 @@ class Notify
 
                                                 // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yj_amount,'annuity'=>$ylj_amount,'fugou'=>$fgj_amount]);
                                             }else if($spread_data['user_group'] == 7){
-                                                $ssf =round($pv * 0.17,2);
-                                                $con       = $spread_data['contribute'] + round($pv * 0.17,2);
-                                                $score     = $spread_data['score'] + round($pv * 0.17,2);
+                                                $ssf =bcmul($pv, 0.17,2);
+                                                $con       = $spread_data['contribute'] + bcmul($pv * 0.17,2);
+                                                $score     = $spread_data['score'] + bcmul($pv, 0.17,2);
                                                 // $yj_amount = $spread_data['brokerage_price'] + round($pv * 0.17,2);
 
-                                                $yj_amount_90 = round($pv * 0.17,2) * 0.9;
-                                                $fgj_amount_10 = round($pv * 0.17,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                                $yj_amount_90 = bcmul($pv, 0.17,2) * 0.9;
+                                                $fgj_amount_10 = bcmul($pv, 0.17,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                                                 $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                                                 $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -291,7 +291,7 @@ class Notify
                                             //积分
                                             $this->score_log($spread_data['uid'],$ssf,$store_order_data['order_id'],11,"精彩生活区商品赠送积分");
                                             // //推广佣金
-                                            $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
+                                            $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id'],0);
                                             //养老金
                                             $this->bill_user_log($spread_data['uid'],round($pv * 0.05,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'推广获得养老金'.round($pv * 0.05,2),$store_order_data['mer_id'],0);
                                         }
@@ -300,8 +300,8 @@ class Notify
                                         if($spread_data['user_group'] == 1){
                                             //给推广者分配佣金
                                             // $ylj_amount = $spread_data['annuity'] + round($pv * 0.3,2);
-                                            $yj_amount_90 = round($pv * 0.21,2) * 0.9;
-                                            $fgj_amount_10 = round($pv * 0.21,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                            $yj_amount_90 = bcmul($pv, 0.21,2) * 0.9;
+                                            $fgj_amount_10 = bcmul($pv, 0.21,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -309,8 +309,8 @@ class Notify
 
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
 
-                                            $con = $spread_data['contribute'] + round($pv * 0.21,2);
-                                            $score = $spread_data['score'] + round($pv * 0.21,2);
+                                            $con = $spread_data['contribute'] + bcmul($pv, 0.21,2);
+                                            $score = $spread_data['score'] + bcmul($pv, 0.21,2);
 
                                             //贡献值和积分
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(["contribute"=>$con,"score"=>$score]);
@@ -318,7 +318,7 @@ class Notify
                                             //推广养老金
 
                                             //推广佣金
-                                            $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
+                                            $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id'],0);
                                             $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送贡献值");
                                             $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送积分");
 
@@ -341,8 +341,8 @@ class Notify
                                             //$merchant_amount = $merchant_user_data['brokerage_price'] + round($pv * 0.05,2);
                                             //给推广者分配佣金
 
-                                            $yj_amount_90 = round($pv * 0.05,2) * 0.9;
-                                            $fgj_amount_10 = round($pv * 0.05,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                            $yj_amount_90 = bcmul($pv, 0.05,2) * 0.9;
+                                            $fgj_amount_10 = bcmul($pv, 0.05,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                                             $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
                                             $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
@@ -352,7 +352,7 @@ class Notify
 
                                             //Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                                             //推广佣金
-                                            $this->bill_user_log($merchant_data['uid'],  $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.  $yj_amount_90,$store_order_data['mer_id'],0);
+                                            $this->bill_user_log($merchant_data['uid'],  $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.  $yj_amount_90,$store_order_data['mer_id'],0);
 
                                         }
 
@@ -398,7 +398,7 @@ class Notify
                                     $le_yw_amount = 600;
                                 }
 
-                                $ylj_pri = round($pv * 0.035,2);
+                                $ylj_pri = bcmul($pv, 0.035,2);
                                 //$pv = round($pv * 0.35,2);
 
                                 //分配养老金给消费者
@@ -412,7 +412,7 @@ class Notify
  
                                 $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
  
-                                $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
+                                $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1, $pv);
                                 $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
 
 
@@ -446,7 +446,7 @@ class Notify
                                         $con =0;//贡献值
                                         $score = 0;//积分
                                         //养老金
-                                        $uer_bill = $spread_data['annuity'] + round($pv * 0.035,2);
+                                        $uer_bill = $spread_data['annuity'] + bcmul($pv, 0.035,2);
 
 
                                         $yj_amount_90 = $le_yw_amount * 0.9;
@@ -460,8 +460,8 @@ class Notify
 
                                         if($spread_data['user_group'] == 2){
 
-                                            $con = $spread_data['contribute'] + round($pv * 0.07,2);
-                                            $score = $spread_data['brokerage_price'] + round($pv * 0.07,2);
+                                            $con = $spread_data['contribute'] + bcmul($pv, 0.07,2);
+                                            $score = $spread_data['brokerage_price'] + bcmul($pv, 0.07,2);
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
@@ -470,8 +470,8 @@ class Notify
                                             //$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);
-                                            $score = $spread_data['brokerage_price'] + round($pv * 0.09,2);
+                                            $con = $spread_data['contribute'] + bcmul($pv, 0.09,2);
+                                            $score = $spread_data['brokerage_price'] + bcmul($pv, 0.09,2);
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
@@ -481,8 +481,8 @@ class Notify
 
 
                                         }else if($spread_data['user_group'] == 4){
-                                            $con = $spread_data['contribute'] + round($pv * 0.11,2);
-                                            $score = $spread_data['brokerage_price'] + round($pv * 0.11,2);
+                                            $con = $spread_data['contribute'] + bcmul($pv, 0.11,2);
+                                            $score = $spread_data['brokerage_price'] + bcmul($pv, 0.11,2);
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
@@ -492,8 +492,8 @@ class Notify
 
 
                                         }else if($spread_data['user_group'] == 5){
-                                            $con = $spread_data['contribute'] + round($pv * 0.13,2);
-                                            $score = $spread_data['brokerage_price'] + round($pv * 0.13,2);
+                                            $con = $spread_data['contribute'] + bcmul($pv, 0.13,2);
+                                            $score = $spread_data['brokerage_price'] + bcmul($pv, 0.13,2);
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
@@ -502,8 +502,8 @@ class Notify
                                            // $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);
-                                            $score = $spread_data['brokerage_price'] + round($pv * 0.15,2);
+                                            $con = $spread_data['contribute'] + bcmul($pv, 0.15,2);
+                                            $score = $spread_data['brokerage_price'] + bcmul($pv, 0.15,2);
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
@@ -513,8 +513,8 @@ class Notify
 
 
                                         }else if($spread_data['user_group'] == 7){
-                                            $con = $spread_data['contribute'] + round($pv * 0.17,2);
-                                            $score = $spread_data['brokerage_price'] + round($pv * 0.17,2);
+                                            $con = $spread_data['contribute'] + bcmul($pv, 0.17,2);
+                                            $score = $spread_data['brokerage_price'] + bcmul($pv, 0.17,2);
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                                             //贡献值
@@ -528,12 +528,12 @@ class Notify
                                         $this->score_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
-                                        $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                                        $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, $pv);
 
                                         //养老金
                                         $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
                                         //佣金
-                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
+                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'. $yj_amount_90,$store_order_data['mer_id']);
                                         //复购金
                                         $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
@@ -546,15 +546,15 @@ class Notify
                                         // //推广养老金
                                         // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'推广获得养老金'.round($pv * 0.01,2),$store_order_data['mer_id']);
                                         // //推广佣金
-                                        // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.round($pv * 0.01,2),$store_order_data['mer_id']);
+                                        // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.round($pv * 0.01,2),$store_order_data['mer_id']);
 
                                         //获取贡献值和积分和佣金
-                                        $gx_jf = $spread_data['contribute'] + round($pv * 0.21,2);
+                                        $gx_jf = $spread_data['contribute'] + bcmul($pv, 0.21,2);
 
                                         //$yj111 = $spread_data['brokerage_price'] + $yj1;
 
-                                        $yj_amount_90 = round($yj1 * 0.9,2);
-                                        $fgj_amount_10 = round($yj1 * 0.1,2);//推广者的佣金抽10%到个人复购金
+                                        $yj_amount_90 = bcmul($yj1, 0.9,2);
+                                        $fgj_amount_10 = bcmul($yj1, 0.1,2);//推广者的佣金抽10%到个人复购金
 
                                         $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                                         $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -562,10 +562,10 @@ class Notify
 
 
                                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
-                                        $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                                        $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, $pv);
                                         $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
                                         //推广佣金
-                                        $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id']);
+                                        $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id']);
                                     }
 
 
@@ -579,7 +579,7 @@ class Notify
                                     // $spread_data = Db::name('user')->where('uid',473)->find();
 
                                     //养老金
-                                    $uer_bill = $spread_data['annuity'] + round($pv * 0.035,2);
+                                    $uer_bill = $spread_data['annuity'] + bcmul($pv, 0.035,2);
 
 
                                     $yj_amount_90 = $le_yw_amount * 0.9;
@@ -589,11 +589,11 @@ class Notify
                                     $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
 
 
-                                    $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                                    $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, $pv);
                                     //养老金
                                     $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
                                     //佣金
-                                    $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
+                                    $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'. $yj_amount_90,$store_order_data['mer_id']);
                                     //复购金
                                     $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
@@ -625,8 +625,8 @@ class Notify
                                     if(!empty($merchant_user_data)){
 
 
-                                        $yj_amount_90 = round($pv * 0.035,2) * 0.9;
-                                        $fgj_amount_10 = round($pv * 0.035,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                        $yj_amount_90 = bcmul($pv, 0.035,2) * 0.9;
+                                        $fgj_amount_10 = bcmul($pv, 0.035,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                                         $yj_amount = $merchant_data['brokerage_price'] + $yj_amount_90;
                                         $fgj_amount = $merchant_data['fugou'] + $fgj_amount_10;
@@ -636,7 +636,7 @@ class Notify
 
                                         //Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                                         //推广佣金
-                                        $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.round($pv * 0.35,2),$store_order_data['mer_id']);
+                                        $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.round($pv * 0.35,2),$store_order_data['mer_id']);
                                     }
 
                                 }
@@ -925,7 +925,7 @@ class Notify
 
 
         //code...
-        $pay_gb =  round($orderInfo['num'] * $orderInfo['gb_num'],2);
+        $pay_gb =  bcmul($orderInfo['num'], $orderInfo['gb_num'],2);
         //$pay_vr =  round($orderInfo['num'] * $orderInfo['vr_num'],2);
         //付款按照700的VR付款 start
         $vr_num = 0;
@@ -959,17 +959,17 @@ class Notify
 
             if($orderInfo['price'] == 1180){
                 //修改订单到账状态
-                $zs_ylj = round(700 * 0.05,2);//计算的养老金 金额
+                $zs_ylj = bcmul(700, 0.05,2);//计算的养老金 金额
             }elseif($orderInfo['price'] == 11800){
-                $zs_ylj = round(7000 * 0.05,2);//计算的养老金 金额
+                $zs_ylj = bcmul(7000, 0.05,2);//计算的养老金 金额
             }elseif($orderInfo['price'] == 3540){
-                $zs_ylj = round(2100 * 0.05,2);//计算的养老金 金额
+                $zs_ylj = bcmul(2100, 0.05,2);//计算的养老金 金额
             }elseif($orderInfo['price'] == 10620){
-                $zs_ylj = round(6300 * 0.05,2);//计算的养老金 金额
+                $zs_ylj = bcmul(6300, 0.05,2);//计算的养老金 金额
             }elseif($orderInfo['price'] == 9440){
-                $zs_ylj = round(5600 * 0.05,2);//八单计算的养老金 金额
+                $zs_ylj = bcmul(5600, 0.05,2);//八单计算的养老金 金额
             }elseif($orderInfo['price'] == 2360){
-                $zs_ylj = round(1400 * 0.05,2);//两单计算的养老金 金额
+                $zs_ylj = bcmul(1400, 0.05,2);//两单计算的养老金 金额
             }
 
 
@@ -1396,15 +1396,15 @@ class Notify
 
 
     //添加贡献值日志
-    public function con_log($uid,$num,$order_id,$order_type,$mark,$status = -1){
+    public function con_log($uid,$num,$order_id,$order_type,$mark,$status = -1, $pv = 0){
 
         $con_data = Db::name('user')->where("uid",$uid)->find();
         //如果状态是1那就是即刻入账，
         if($status == 1){
           
 
-            //如果当前用户是业务经理之前的等级，那么需要将当前用户的直推用户贡献值加到自己贡献值中去
-            if( $con_data['user_group'] <= 2 ){
+            // //如果当前用户是业务经理之前的等级，那么需要将当前用户的直推用户贡献值加到自己贡献值中去
+            // if( $con_data['user_group'] <= 2 ){
            
                 $spread_data = Db::name('user')->where("spread_uid",$uid)->select();
 
@@ -1456,27 +1456,28 @@ class Notify
 
                // }
 
-            }else{
+            // }else{
                 
-                // 检查是否包含“推广”
-                // if (strpos($mark, "推广") !== false) {
-                //     echo "字符串1包含'推广'\n";
-                // }
+            //     // 检查是否包含“推广”
+            //     // if (strpos($mark, "推广") !== false) {
+            //     //     echo "字符串1包含'推广'\n";
+            //     // }
 
-                // 检查是否包含“购买”
-                if (strpos($mark, "购买") !== false) {
-                    Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
-                }
+            //     // 检查是否包含“购买”
+            //     if (strpos($mark, "购买") !== false) {
+            //         Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+            //     }
 
                  
                
                
-            }
+            // }
 
         }
 
         $con = [
             'uid'=>$uid,
+            'pv' => $pv,
             'number'=>$num,//赠送数量
             'status'=>$status,//红包状态
             'mark'=>$mark,//备注

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

@@ -1593,7 +1593,7 @@ public function getbig_samll_datas_copy($user_id) {
                     //积分
                     $this->score_log($spread_data['uid'],$ssf,$store_order_data['order_id'],11,"精彩生活区商品赠送积分");
                     // //推广佣金
-                    $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
+                    $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id'],0);
                     //养老金
                     $this->bill_user_log($spread_data['uid'],round($pv * 0.05,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'推广获得养老金'.round($pv * 0.05,2),$store_order_data['mer_id'],0);
                 }
@@ -1620,7 +1620,7 @@ public function getbig_samll_datas_copy($user_id) {
                   //推广养老金
                  // $this->bill_user_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'推广获得养老金'.round($pv * 0.3,2),$store_order_data['mer_id']);
                   //推广佣金
-                  $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
+                  $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id'],0);
                   $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
                   $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
                   
@@ -1654,7 +1654,7 @@ public function getbig_samll_datas_copy($user_id) {
                     
                     Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                 //推广佣金
-                $this->bill_user_log($merchant_data['uid'],  $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.  $yj_amount_90,$store_order_data['mer_id'],0);
+                $this->bill_user_log($merchant_data['uid'],  $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.  $yj_amount_90,$store_order_data['mer_id'],0);
                         
                         }
 
@@ -1804,7 +1804,7 @@ public function getbig_samll_datas_copy($user_id) {
                 //养老金
                 $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
                 //佣金
-                $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'. $yj_amount_90,$store_order_data['mer_id']);
                 //复购金
                 $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1);
 
@@ -1817,7 +1817,7 @@ public function getbig_samll_datas_copy($user_id) {
                     // //推广养老金
                     // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'推广获得养老金'.round($pv * 0.01,2),$store_order_data['mer_id']);
                     // //推广佣金
-                    // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.round($pv * 0.01,2),$store_order_data['mer_id']);
+                    // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.round($pv * 0.01,2),$store_order_data['mer_id']);
                     
                 //获取贡献值和积分和佣金
                 $gx_jf = $spread_data['contribute'] + round($pv * 0.03,2);
@@ -1836,7 +1836,7 @@ public function getbig_samll_datas_copy($user_id) {
                 $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
                 $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
                 //推广佣金
-                $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id']);
             }
 
         
@@ -1864,7 +1864,7 @@ public function getbig_samll_datas_copy($user_id) {
                 
                 Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
             //推广佣金
-            $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.round($pv * 0.35,2),$store_order_data['mer_id']);
+            $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.round($pv * 0.35,2),$store_order_data['mer_id']);
             }
 
         }

app/controller/api/store/service/Huafei.php

@@ -125,7 +125,7 @@ class Huafei extends BaseController
 
 		foreach($data as $k=>$v){
 
-			$commissionMoney = $v['money']*0.04;
+			$commissionMoney = $v['money']*0.02;
 			$systemvalueObj = $goods_obj = Db::name('system_config_value')->where('config_key','sanfangfenpei')->find();
 
 			$sanfangfenpei=json_decode($systemvalueObj['value'],true);
@@ -194,7 +194,7 @@ class Huafei extends BaseController
 	//话费充值推送
 	public function pushHf($uid, $order_sn, $phone, $money, $order_id = 0){
 
-		$commissionMoney = $money*0.04;
+		$commissionMoney = $money*0.02;
 		//判断数据库有无此订单
 		$type_shop = 9;
 		$orderThird = app()->make(UserThirdRepository::class);
@@ -225,13 +225,13 @@ class Huafei extends BaseController
 		$push = $this->pushOrder($order_sn, $phone, $money);
 		Db::name('log')->insert(['data'=>'话费充值推送订单返回数据'.json_encode($push)]);
 		if($push['code'] == '0000'){
-			$commissionMoney = $money*0.04;
+			$commissionMoney = $money*0.02;
 			//成功入库记录
 			$insertdata = [
 				'uid'=> $uid,
 				'mobile' => $phone,
 				'commission'=> $commissionMoney,
-				'commission_share'=> 0.04,
+				'commission_share'=> 0.02,
 				'order_number' => $push['data']['order_number'],
 				'order_sn' => $order_sn,
 				'amount_price' => $push['data']['amount'],
@@ -246,13 +246,13 @@ class Huafei extends BaseController
 			Db::name('order_huafei')->insert($insertdata);
 			return $push;
 		}else{
-			$commissionMoney = $money*0.04;
+			$commissionMoney = $money*0.02;
 			//失败入库记录
 			$insertdata = [
 				'uid'=> $uid,
 				'mobile' => $phone,
 				'commission'=> $commissionMoney,
-				'commission_share'=> 0.04,
+				'commission_share'=> 0.02,
 				'order_number' => '',
 				'order_sn' => $order_sn,
 				'amount_price' => $money,

app/controller/api/user/User.php

@@ -41,6 +41,7 @@ use think\facade\Log;
 use think\facade\Request as r;
 
 use app\common\common;
+use phpseclib3\Math\BigInteger\Engines\BCMath;
 
 class User extends BaseController
 {
@@ -240,6 +241,8 @@ class User extends BaseController
                 $children = $this->buildTreeContribute($users, $user['uid']); // 递归查找子节点
                 if ($children) {
                     $user['children'] = $children; // 如果有子节点，添加到当前节点
+                }else{
+                    $user['children'] = [];
                 }
                 $user['total_contribute'] = $user['contribute_sum']; // 初始化当前节点的总余额为自身余额
                 if ($children) { // 如果存在子节点，计算总余额
@@ -337,15 +340,19 @@ class User extends BaseController
             //如果用户等级为用户身份 只查一级直推
             //去除掉贡献值最大的下级
             $child_nums = $this->getRecursiveChildrenChengji($user_id, $number);
-            $child_nums_Tree = $this->buildTreeContribute($child_nums);
+            $child_nums_Tree = $this->buildTreeContribute($child_nums, $con['spread_uid']);
             if (empty($child_nums_Tree)){
                 $child_nums_Tree = $child_nums;
                 $total_contribute = $child_nums_Tree[0]['per_contribute'];
             }else{
                 // 找到贡献值最大的用户的索引
-                $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_contribute')), array_column($child_nums_Tree, 'total_contribute'));
-                // 减去该用户的贡献值
-                $total_contribute = bcsub($child_nums_Tree[0]['total_contribute'], $child_nums_Tree[0]['children'][$maxBalanceIndex]['total_contribute'], 2);
+                if(count($child_nums_Tree[0]['children'])){
+                    $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_contribute')), array_column($child_nums_Tree, 'total_contribute'));
+                    // 减去该用户的贡献值
+                    $total_contribute = bcsub($child_nums_Tree[0]['total_contribute'], $child_nums_Tree[0]['children'][$maxBalanceIndex]['total_contribute'], 2);
+                }else{
+                    $total_contribute = $child_nums_Tree[0]['total_contribute'];
+                }
             }
             $data['team_gongxian_num'] = $total_contribute;
 
@@ -1489,63 +1496,141 @@ class User extends BaseController
 
     }
 
-    /**
-     * 一壶茶-团队列表
-     */
-    public function team_list()
-    {
-        $teamid = $this->request->uid();
-
-        //return app("json")->fail("未做任何修改");
-        //$teamid =  $this->request->param('teamid');//测试ID
-        //$teamid = 17;
 
+    public function buildTreePv($users, $parentId = 0) {
+        $branch = array();
+        foreach ($users as $user) {
+            if ($user['spread_uid'] == $parentId) {
+                $children = $this->buildTreePv($users, $user['uid']); // 递归查找子节点
+                if ($children) {
+                    $user['children'] = $children; // 如果有子节点，添加到当前节点
+                }else{
+                    $user['children'] = [];
+                }
+                $user['team_count'] = count($children);
+                $user['total_pv'] = $user['pv']; // 初始化当前节点的总余额为自身余额
+                if ($children) { // 如果存在子节点，计算总余额
+                    foreach ($children as $child) {
+                        $user['total_pv'] += $child['total_pv']; // 累加子节点的总余额
+                        $user['team_count'] += $child['team_count'];
+                    }
+                }
+                $branch[] = $user; // 将当前节点添加到树中
+            }
+        }
+        return $branch; // 返回当前分支的所有节点
+    }
 
-        if($teamid == 592){
-             $teamid = 17;//593
+    // 根据父级uid,递归获取所有子级UID数组 默认深度10级
+    public function getdepartmentStatistics($parentUid) {
+        $user = Db::name('user')->where('uid', $parentUid)->field('uid,nickname,avatar,spread_uid,pv,create_time')->find();
+        $uids = [];// 用于存储符合条件的子级 uid
+        $result = [$user]; // 用于存储符合条件的子级数据
 
-//            // $ss=  $this->userupdates($teamid);
-//            // var_dump($ss);
+        // 定义递归函数
+        $recursion = function ($parentUid) use (&$uids, &$result, &$recursion) {
+            // 查询当前父级的所有直接子级
+            $children = Db::name('user')->field('uid,nickname,avatar,spread_uid,pv,create_time')->where("spread_uid", $parentUid)->select()->toArray();
+            // 如果没有子级，直接返回
+            if (!count($children) && count($children) < 1) {
+                return;
+            }
 
- //$team_userinfo_old_jbp22 = $this->getPerformance22(17);
-//var_dump($team_userinfo_old_jbp22);
- $datas_jbp = Db::name('user')->where("status",1)->select();
+            // 遍历每个子级
+            foreach ($children as $childUid) {
+                //如果有重复的就跳过 防止死循环
+                if(in_array($childUid['uid'], $uids)){
+                    continue;
+                }
+                // 将符合条件的子级 uid 添加到结果数组
+                $uids[] = $childUid['uid'];
+                $result[] = $childUid;
+                // 递归查询子级的子级
+                $recursion($childUid['uid']);
+            }
+        };
 
- //var_dump( $team_userinfo_old_jbp22['person_nums_pv']);
+        // 从初始父级开始递归查询
+        $recursion($parentUid);
 
-foreach($datas_jbp as $k=>$v){
-    $team_userinfo_old_jbp22 = $this->getPerformance22($v['uid']);
-    var_dump("id:" . $v['uid'] . "  用户:" . $v['nickname'] . "    小部门贡献值 :" .  $team_userinfo_old_jbp22['person_nums_pv'] . " 大部门: " . $team_userinfo_old_jbp22['common_nums_pv']);
-}
+        return $result; // 返回结果数组，并去重
+    }
 
- return;
-//                 $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
+    /**
+     * 一壶茶-团队列表
+     */
+    public function team_list()
+    {
+        $teamid = $this->request->uid();
 
-//            //return;
-//               var_dump($team_userinfo_old_jbp1);return;
+        //小夏重写部分
+        $user_id = $teamid;
+        //如果下级团队只有一个人 那就不用再查了 为0
+        //如果用户等级为用户身份 只查一级直推
+        //去除掉贡献值最大的下级
+        $user = Db::name('user')->where('uid', $user_id)->field('uid,nickname,avatar,spread_uid,pv,create_time')->find();
+        $child_nums = $this->getdepartmentStatistics($user_id);
+        $child_nums_Tree = $this->buildTreePv($child_nums, $user['spread_uid']);
+        $person_nums_pv = 0;//大部门业绩
+        $common_nums_pv = 0;//小部门业绩
+        $aLL_list = [];//全部数据
+        $person_list = [];//大部门数据
+        $common_list = [];//小部门数据
+        if(count($child_nums_Tree) && isset($child_nums_Tree[0]['children']) && count($child_nums_Tree[0]['children'])){
+            //获取大部门的key
+            $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_pv')), array_column($child_nums_Tree, 'total_pv'));
+            foreach($child_nums_Tree[0]['children'] as $k=>$v){
+                if($k == $maxBalanceIndex){
+                    $person_list[] = [
+                        "uid" => $v["uid"],
+                        "spread_uid" => $v['spread_uid'],
+                        "nickname" => $v['nickname'],
+                        "avatar" => $v['avatar'],
+                        "pv" => $v['pv'],
+                        "total_performance" => (int)$v['total_pv'],
+                        "create_time" => $v['create_time'],
+                        'team_count'=> $v['team_count']
+                    ];
+                    $person_nums_pv = bcadd($person_nums_pv,$v['total_pv']);
+                }else{
+                    $common_list[] = [
+                        "uid" => $v["uid"],
+                        "spread_uid" => $v['spread_uid'],
+                        "nickname" => $v['nickname'],
+                        "avatar" => $v['avatar'],
+                        "pv" => $v['pv'],
+                        "total_performance" => (int)$v['total_pv'],
+                        "create_time" => $v['create_time'],
+                        'team_count'=> $v['team_count']
+                    ];
+                    $common_nums_pv = bcadd($common_nums_pv,$v['total_pv']);
+                }
+                $aLL_list[] =  [
+                    "uid" => $v["uid"],
+                    "spread_uid" => $v['spread_uid'],
+                    "nickname" => $v['nickname'],
+                    "avatar" => $v['avatar'],
+                    "pv" => $v['pv'],
+                    "total_performance" => (int)$v['total_pv'],
+                    "create_time" => $v['create_time'],
+                    'team_count'=> $v['team_count']
+                ];
+            }
         }
 
 
-        //根据用户找jbp1.0的节点人数组 end
-
-        $datas_jbp = Db::name('old_user_jbp')->where("id",$teamid)->find();//查询旧系统是否有当前会员
-        $type = $this->request->param('type',0);//1：大部门，0：小部门,2:直推
-        // 初始化最终返回的数据
-        $data = [
-            'team_list' => [],
-            'fans_num' => 0, // 粉丝数
-            'new_performance' => 0, // 新增业绩
-            'total_performance' => 0, // 总业绩
-            'person_nums' => 0, // 个人联盟人数
-            'common_nums' => 0, // 公共联盟人数
-            'common_nums_pv' => 0, // 公共联盟PV
-            'person_nums_pv' => 0, // 个人联盟PV
-        ];
-
-        // 如果在旧系统中有数据
-     
-            $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
-            $tes = $this->teamPeople($teamid, $type); // 1:团队, 2:个人
+            $type = $this->request->param('type',0);//1：大部门，0：小部门,2:直推
+            // 初始化最终返回的数据
+            $data = [
+                'team_list' => [],
+                'fans_num' => 0, // 粉丝数
+                'new_performance' => 0, // 新增业绩
+                'total_performance' => 0, // 总业绩
+                'person_nums' => 0, // 个人联盟人数
+                'common_nums' => 0, // 公共联盟人数
+                'common_nums_pv' => 0, // 公共联盟PV
+                'person_nums_pv' => 0, // 个人联盟PV
+            ];
 
             $data1 = [
                 "total" => 100,
@@ -1556,52 +1641,27 @@ foreach($datas_jbp as $k=>$v){
             ];
 
             if ($type != 2) {
-                foreach ($tes as $k => $v) {
-                    $curr_pv = '';
-                    if ($v['curr_type'] == 0) {
-                        $curr_pv = $team_userinfo_old_jbp1['person_nums_pv'];
-                    } elseif ($v['curr_type'] == 1) {
-                        $curr_pv = $team_userinfo_old_jbp1['common_nums_pv'];
-                    } else {
-                        $curr_pv = 0;
-                    }
-
-                    $data1['data'][$k] = [
-                        "uid" => $v["id"],
-                        "nickname" => $v['user_name'] . $curr_pv,
-                        "phone" => "137****3315",
-                        "avatar" => "https://cdn.bjtdba.com/vod/image/2025-01-20/20250120125206881.png",
-                        "create_time" => "2025-01-25 11:00:18",
-                        "identity" => "11",
-                        "level" => "40002",
-                        "partnership" => "22",
-                        "total_performance" => $curr_pv,
-                        "new_performance" => 0,
-                        "team_count" => $v["performance"]['common_nums'] + $v["performance"]['person_nums'] + 1,
-                    ];
+                if($type == 1){
+                    $data1['data'] = $person_list;
+                }else{
+                    $data1['data'] = $common_list;
                 }
             } else {
-                foreach ($tes as $k => $v) {
-                    $data1['data'][$k] = [
-                        "uid" => $v["uid"],
-                        "nickname" => $v['nickname'],
-                        "avatar" => $v['avatar'],
-                        "create_time" => "2025-01-25 11:00:18",
-                    ];
-                }
+                $data1['data'] = $aLL_list;
             }
 
             // 旧系统中的公共部分数据
+            $data['teamid'] = $teamid;
             $data['team_list'] = $data1;
-            $data['fans_num'] = $team_userinfo_old_jbp1['person_nums'] + $team_userinfo_old_jbp1['common_nums'];
-            $data['new_performance'] = 0;
-            $data['total_performance'] = $team_userinfo_old_jbp1['sum_nums_pv'];
-            $data['person_nums'] = $team_userinfo_old_jbp1['common_nums'];
-            $data['common_nums'] = $team_userinfo_old_jbp1['person_nums'];
-            $data['common_nums_pv'] = max($team_userinfo_old_jbp1['common_nums_pv'], $team_userinfo_old_jbp1['person_nums_pv']);
-            $data['person_nums_pv'] = min($team_userinfo_old_jbp1['common_nums_pv'], $team_userinfo_old_jbp1['person_nums_pv']);
+            $data['fans_num'] = $child_nums_Tree[0]['team_count'];//总人数
+            $data['new_performance'] = 0;//新增业绩
+            $data['total_performance'] = (int)bcadd($child_nums_Tree[0]['total_pv'] ?? 0, 0, 2);//总业绩
+            $data['person_nums'] = count($person_list);//大部门人数
+            $data['common_nums'] = count($common_list);//小部门人数
+            $data['common_nums_pv'] = $person_nums_pv;//大部门业绩
+            $data['person_nums_pv'] = $common_nums_pv;//小部门业绩
       
-return app("json")->success($data);
+            return app("json")->success($data);
 // // 查询当前会员旗下的会员数据（分页）
 //         [$page, $limit] = $this->getPage();
 //         $subordinate_members = Db::name('user')