三方电商比例调整

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

@@ -3164,8 +3164,14 @@ class StoreOrderRepository extends BaseRepository
 //            $oldagefee=$this->decimal2($order["extension_one"]* $yanglao * 0.01);
 
         //y养老金最新调整 =佣金的*50%
-        $oldagefee=round($order['total_price']*0.5 ,2);
-        log::info("++{$order['total_price']}+养老金===={$oldagefee}");
+
+        $systemvalueObj= $goods_obj = Db::name('system_config_value')
+            -> where('config_key','sanfangfenpei')->find();;
+
+        $sanfangfenpei=json_decode($systemvalueObj['value'],true);
+
+        $oldagefee=round($order['total_price']*$sanfangfenpei['yanglaojin'] ,2);
+        log::info("++{$order['total_price']}+返回佣金===={$oldagefee}");
         //当前已扣会费总额
 //            $oldagefee = $oldagefee-$dues;
         $mark = "消费获得养老金".$oldagefee;

app/common/repositories/user/UserThirdRepository.php

@@ -643,7 +643,11 @@ class UserThirdRepository extends BaseRepository
             //更新用户积分
 
             $user = Db::name('user')->where('uid', $user_id)->find();
-            $inc_score = round($price*0.5,2);//pv=佣金的50%=积分=贡献值
+            $systemvalueObj= $goods_obj = Db::name('system_config_value')
+                -> where('config_key','sanfangfenpei')->find();;
+
+            $sanfangfenpei=json_decode($systemvalueObj['value'],true);
+            $inc_score = round($price*$sanfangfenpei['pv'],2);//pv=佣金的50%=积分=贡献值
             log::info("===========dddddddddddddddddddd");
 
 
@@ -729,7 +733,7 @@ class UserThirdRepository extends BaseRepository
 
 
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加贡献记录
-            log::info("===添加完积分和养老金");
+            log::info("===添加完积分和贡献值");
 
 
 //

app/controller/api/store/product/Jd.php

@@ -487,7 +487,7 @@ class Jd extends BaseController
         ]);
         //自定义时间  每20分钟执行一次查询前半小时的数据
         if (!$time['startTime'] && !$time['endTime']) {
-            $time['startTime'] = date("Y-m-d H:i:s", strtotime("-200 minute"));
+            $time['startTime'] = date("Y-m-d H:i:s", strtotime("-20 minute"));
             $time['endTime'] = date('Y-m-d H:i:s');
         }
 //        var_dump($time);

app/controller/api/store/product/Jt.php

@@ -268,13 +268,16 @@ class Jt extends BaseController
 //        $formatList = [];
         foreach ($goodsList as $value) {
             log::info("京推推定时返回数据");
-            log::info($value);
+//            log::info($value);
             $finalPrice = $value['final_price']; //商品最终价格（使用优惠券后的商品最终价格）
             $commissionRate = $value['commissionShare'];  //京推推商品佣金比率
             $commissionMoney = sprintf('%.2f', ($finalPrice * $commissionRate / 100)); // 商品最终价格 * 京推推商品佣金比率 /100 =最终佣金
+            $systemvalueObj= $goods_obj = Db::name('system_config_value')
+                -> where('config_key','sanfangfenpei')->find();;
 
-            $pv=$commissionMoney*0.5;  //PV
-            $yanglaojin=$pv; //新的养老金
+            $sanfangfenpei=json_decode($systemvalueObj['value'],true);
+            $pv=$commissionMoney*$sanfangfenpei['pv'];  //PV
+            $yanglaojin=$commissionMoney*$sanfangfenpei['yanglaojin']; //新的养老金
 
             
             //养老金
@@ -535,8 +538,17 @@ class Jt extends BaseController
 
             $commission=$commissionMoney; //佣金(预估)
 //            $commission=$detail['commissionInfo']['commission'];
-            $pv=$commission * 0.5;  //PV
-            $yanglaojin=$pv; //新的养老金
+
+            $systemvalueObj= $goods_obj = Db::name('system_config_value')
+                -> where('config_key','sanfangfenpei')->find();;
+
+            $sanfangfenpei=json_decode($systemvalueObj['value'],true);
+            $pv=$commissionMoney*$sanfangfenpei['pv'];  //PV
+            $yanglaojin=$commissionMoney*$sanfangfenpei['yanglaojin']; //新的养老金
+
+
+//            $pv=$commission * 0.5;  //PV
+//            $yanglaojin=$pv; //新的养老金
 
             $gongxian=$pv; //新的养老金
             $jifen=$pv; //新的养老金

app/controller/api/store/product/Su.php

@@ -169,8 +169,14 @@ class Su extends BaseController
                     // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $goods['commodityInfo']['commodityPrice'] * $goods['commodityInfo']['rate'] / 100 ?? '');
                     
                     $commission=$goods['commodityInfo']['commodityPrice'] * $goods['commodityInfo']['rate'] / 100; //佣金
-                    $pv=round($commission* 0.5,2);  //PV
-                    $yanglaojin=$pv; //新的养老金
+//                    $pv=round($commission* 0.5,2);  //PV
+//                    $yanglaojin=$pv; //新的养老金
+
+                    $systemvalueObj= $goods_obj = Db::name('system_config_value')
+                        -> where('config_key','sanfangfenpei')->find();;
+                    $sanfangfenpei=json_decode($systemvalueObj['value'],true);
+                    $pv=round($commission*$sanfangfenpei['pv'],2);  //PV
+                    $yanglaojin=round($commission*$sanfangfenpei['yanglaojin'],2); //新的养老金
 
 
                     // if($yanglaojin < 0.1) {
@@ -528,8 +534,14 @@ class Su extends BaseController
         log::info("===========commission=====$commission=============");
         log::info("===========res==================");
         log::info($result);
-        $pv=$commission* 0.5;  //PV
-        $yanglaojin=$pv; //新的养老金
+//        $pv=$commission* 0.5;  //PV
+//        $yanglaojin=$pv; //新的养老金
+
+        $systemvalueObj= $goods_obj = Db::name('system_config_value')
+            -> where('config_key','sanfangfenpei')->find();;
+        $sanfangfenpei=json_decode($systemvalueObj['value'],true);
+        $pv=round($commission*$sanfangfenpei['pv'],2);  //PV
+        $yanglaojin=round($commission*$sanfangfenpei['yanglaojin'],2); //新的养老金
 
         $gongxian=$pv; //新的养老金
         $jifen=$pv; //新的养老金

app/controller/api/store/product/TaoKe.php

@@ -213,8 +213,15 @@ class TaoKe extends BaseController
 
 //             $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
 
-            $pv=sprintf('%.2f',$commission* 0.5);  //PV
-            $yanglaojin=$pv; //新的养老金
+            $systemvalueObj= $goods_obj = Db::name('system_config_value')
+                -> where('config_key','sanfangfenpei')->find();;
+
+            $sanfangfenpei=json_decode($systemvalueObj['value'],true);
+            $pv=sprintf('%.2f',$commission*$sanfangfenpei['pv']);  //PV
+            $yanglaojin=sprintf('%.2f',$commission*$sanfangfenpei['yanglaojin']); //新的养老金
+
+//            $pv=sprintf('%.2f',$commission* 0.5);  //PV
+//            $yanglaojin=$pv; //新的养老金
             Log::info("养老金：".$yanglaojin);
             // if($yanglaojin < 0.1) {
             //     continue;
@@ -419,12 +426,25 @@ class TaoKe extends BaseController
         if (empty($detail)) {//不能请求到数据将结果返回
             return ['code' => 0, 'data' => $result];
         }
-        $commission = sprintf('%.2f',($detail['min_group_price'] * $detail['promotion_rate']) / 1000 / 100);
+        $commission = round(($detail['min_group_price'] * $detail['promotion_rate']) / 1000 / 100,3);
         // $detail['yanglao'] = app()->make(ProductRepository::class)
         //     ->thirdYanglaojin(0, sprintf('%.2f', $commission));
-        
-            $pv=sprintf('%.2f', $commission *0.5);  //PV
-            $yanglaojin=$pv; //新的养老金
+
+        log::info("commission==={$commission}");
+        $systemvalueObj= $goods_obj = Db::name('system_config_value')
+            -> where('config_key','sanfangfenpei')->find();;
+        $sanfangfenpei=json_decode($systemvalueObj['value'],true);
+        $ppv=$commission*$sanfangfenpei['pv'];
+        $pv3=round($ppv,3);  //PV
+        $pv=round($ppv,2);  //PV
+        log::info("pv==={$pv}===========ppv3={$pv3}");
+        $yanglaojin=round($commission*$sanfangfenpei['yanglaojin'],2); //新的养老金
+
+
+
+
+//            $pv=sprintf('%.2f', $commission *0.5);  //PV
+//            $yanglaojin=$pv; //新的养老金
         
         $gongxian=$pv;
         $jifen=$pv;
@@ -859,7 +879,7 @@ class TaoKe extends BaseController
                 //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
                 $localOrder = PddOrderModel::create($order);
                 //预估养老金
-                $yanglaojin_order = $orderThird->yuguOrder(
+                  $orderThird->yuguOrder(
                     $localOrder['order_pdd_id'],
                     $localOrder['commission'],
                     $localOrder['uid'],

app/controller/api/store/product/Vip.php

@@ -170,8 +170,14 @@ class Vip extends BaseController
                     $commissionRate = $goods['commissionRate'];
                     $commission = $goods['commission'];
 
-                    $pv=$commission* 0.5;  //PV
-                    $yanglaojin=$pv; //新的养老金
+                    $systemvalueObj= $goods_obj = Db::name('system_config_value')
+                        -> where('config_key','sanfangfenpei')->find();;
+                    $sanfangfenpei=json_decode($systemvalueObj['value'],true);
+                    $pv=round($commission*$sanfangfenpei['pv'],2);  //PV
+                    $yanglaojin=round($commission*$sanfangfenpei['yanglaojin'],2); //新的养老金
+
+//                    $pv=$commission* 0.5;  //PV
+//                    $yanglaojin=$pv; //新的养老金
 
 
                     // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
@@ -197,7 +203,7 @@ class Vip extends BaseController
                         'jifen'=>$pv,
                         'yanglaojin' => $yanglaojin,
 
-                        'commission' => $yanglaojin, //养老金 //app()->make(ProductRepository::class)->yanglaojin(0, $commission),//佣金
+                        'commission' => $commission, //养老金 //app()->make(ProductRepository::class)->yanglaojin(0, $commission),//佣金
                         'commission_rate' => $commissionRate,
                         'sales' => "",
                         'coupon_money' => $couponMoney,
@@ -542,9 +548,14 @@ class Vip extends BaseController
         // $result['yanglao'] = app()->make(ProductRepository::class)
         //     ->yanglaojin(0, $result['result'][0]['vipPrice'] * $result['result'][0]['commissionRate'] / 100);
 
-        $commission=$result['result'][0]['vipPrice'] * $result['result'][0]['commissionRate'] / 100 ; //佣金(预估)
-        $pv=$commission* 0.5;  //PV
-        $yanglaojin=$pv; //新的养老金
+        $commission=round($result['result'][0]['vipPrice'] * $result['result'][0]['commissionRate'] / 100 ,2); //佣金(预估)
+//        $pv=$commission* 0.5;  //PV
+//        $yanglaojin=$pv; //新的养老金
+        $systemvalueObj= $goods_obj = Db::name('system_config_value')
+            -> where('config_key','sanfangfenpei')->find();;
+        $sanfangfenpei=json_decode($systemvalueObj['value'],true);
+        $pv=round($commission*$sanfangfenpei['pv'],2);  //PV
+        $yanglaojin=round($commission*$sanfangfenpei['yanglaojin'],2); //新的养老金
 
         $gongxian=$pv; //新的养老金
         $jifen=$pv; //新的养老金