商贸区增加pv

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

@@ -9253,18 +9253,23 @@ class StoreOrderRepository extends BaseRepository
         return $group;
     }
 
-    public function con_log_pv($uid, $num, $order_id, $order_type, $mark, $status = -1)
+    public function con_log_pv($uid, $pv, $order_id, $order_type, $mark, $status = -1)
     {
         // 添加pv记录
         $pv_data = [
             "uid" => $uid,
-            "pv" => $num,
+            "pv" => $pv,
             "addtime" => time(),
             "status" => $status,
             "order_type" => $order_type,
             "order_id" => $order_id,
-            "mark" => str_replace('贡献值', 'PV', $mark),
+            "mark" => $mark,
         ];
+        // 当状态为1时是实时结算
+        if($status == 1) {
+            Db::name('user')->where('uid', $uid)->inc('pv', (float)$pv)->update();
+            $pv_data['settlement_time'] = date('Y-m-d H:i:s');
+        }
         Db::name("user_pv_log")->insert($pv_data);//添加pv记录
     }
 
@@ -9289,10 +9294,6 @@ class StoreOrderRepository extends BaseRepository
                     Db::name('user')->where("uid", $uid)->update(['per_contribute' => $con_data['per_contribute'] + $num]);
                 }
 
-                if($pv > 0){
-                    Db::name('user')->where("uid", $uid)->update(['pv' => $con_data['pv'] + $pv]);
-                }
-
                 //if(count($spread_data) > 0){
                 // $all_ids = [];
                 // foreach($spread_data as $k=>$v){
@@ -9581,7 +9582,7 @@ class StoreOrderRepository extends BaseRepository
                 $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
                 // 贡献值
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送贡献值");
-                $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送贡献值");
+                $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送PV值");
                 // 积分
                 $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送积分");
 
@@ -9674,7 +9675,7 @@ class StoreOrderRepository extends BaseRepository
 
             $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, $gx_jf);
-            $this->con_log_pv($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1);
+            $this->con_log_pv($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送PV值", 1);
             $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
 
             //查询下单用户上级身份（1.0表用户，会员升级）
@@ -9804,7 +9805,10 @@ class StoreOrderRepository extends BaseRepository
 
                 // 让利部分30%给消费者做养老金{$ylj_pri}
                 $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $group_order['group_order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
-
+                // 购买商贸区赠送贡献值
+                $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
+                // 购买商贸区赠送PV值
+                $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区赠送PV值");
                 // 积分
                 $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送积分");
 
@@ -9820,9 +9824,9 @@ class StoreOrderRepository extends BaseRepository
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                         //贡献值
-                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "商贸区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
                         //积分
-                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 12, "商贸区商品赠送积分");
+                        $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);
                         //养老金
@@ -9863,27 +9867,27 @@ class StoreOrderRepository extends BaseRepository
                     $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
                     $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_two']);
 
-                    //商户获得贡献值
-                    if ($concession_pri >= 0.01) {
-                        $gonxian = bcmul($concession_pri, $jdAndGonxianConfig['gonxian'], 2);
-                        $gongxian_data = [
-                            "uid" => $merchant_data["uid"],
-                            "mer_id" => $user_data['mer_id'],
-                            "pv" => $pv,
-                            "number" => $gonxian,
-                            "addtime" => time(),
-                            "status" => -1,
-                            "order_type" => 2,
-                            "order_id" => $store_order_data['order_id'],
-                            "mark" => "锁客商家获得贡献值",
-                            "desc" => '',
-                            "surplus" => $gonxian,
-                            "type" => 1
-                        ];
-                        Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-                    } else {
-                        Db::name('log')->insert(['data' => '订单号：' . $store_order_data['order_id'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
-                    }
+                    //商户获得贡献值  ---- 3月29日  商户不再获得贡献值 改为获得分润值
+//                    if ($concession_pri >= 0.01) {
+//                        $gonxian = bcmul($concession_pri, $jdAndGonxianConfig['gonxian'], 2);
+//                        $gongxian_data = [
+//                            "uid" => $merchant_data["uid"],
+//                            "mer_id" => $user_data['mer_id'],
+//                            "pv" => $pv,
+//                            "number" => $gonxian,
+//                            "addtime" => time(),
+//                            "status" => -1,
+//                            "order_type" => 2,
+//                            "order_id" => $store_order_data['order_id'],
+//                            "mark" => "锁客商家获得贡献值",
+//                            "desc" => '',
+//                            "surplus" => $gonxian,
+//                            "type" => 1
+//                        ];
+//                        Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+//                    } else {
+//                        Db::name('log')->insert(['data' => '订单号：' . $store_order_data['order_id'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
+//                    }
 
                     //商户获得京豆
                     if ($concession_pri >= 0.01) {