Merge branch 'dev' into sxb-dev

app/command/PensionTasks.php

@@ -781,6 +781,30 @@ class PensionTasks extends Command
                     $userRepository->setUserIdentity($user_sign_gongxian['uid']);
                 }
 
+                // 结算PV值
+                $user_pv_list = Db::name('user_pv_log')
+                    ->where('status', -1)
+                    ->where('order_id', $online['order_id'])
+                    ->whereIn('type', [1, 2])
+                    ->select()
+                    ->toArray();
+                if($user_pv_list) {
+                    foreach ($user_pv_list as $user_pv) {
+                        // 修改pv
+                        Db::name('user')
+                            ->where('uid', $user_pv['uid'])
+                            ->inc('pv', (float)$user_pv['pv'])
+                            ->update();
+                        Db::name('user_pv_log')
+                            ->where('status', -1)
+                            ->where('id', $user_pv['id'])
+                            ->update([
+                                'status'          => 1,
+                                'settlement_time' => date('Y-m-d H:i:s')
+                            ]);
+                    }
+                }
+
                 
                 // 结算佣金
                 $user_bill_list = Db::name('user_bill')

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

@@ -3803,8 +3803,9 @@ class StoreOrderRepository extends BaseRepository
             if ($sprerdUser["user_group"] == 7) {
                 $yongjinbili = 17;
             }
-
-            $tuiguanyongjin = round($pvfee * $yongjinbili / 100, 2);
+            $yongjin = $pvfee * $yongjinbili / 100;
+            // 佣金百分之90进入佣金池
+            $tuiguanyongjin = round($yongjin * 0.9, 2);
 
 
             $tuiYongmark = "推荐消费获得佣金" . $tuiguanyongjin;
@@ -3819,6 +3820,21 @@ class StoreOrderRepository extends BaseRepository
                 Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
             }
 
+            if($yongjin >= 0.1){
+                // 佣金百分之10进入复购金
+                $orderThird = app()->make(UserThirdRepository::class);
+                //复购金
+                $orderThird->yuguFugou(
+                    $yongjin,
+                    $sprerdUser["uid"],
+                    $order_sn,
+                    $order["type_shop"]
+                );
+            } else {
+                Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，复购金低于0.01无法入库 特此记录！']);
+            }
+
+
         }
         //end存养老金
 

app/common/repositories/user/UserThirdRepository.php

@@ -865,6 +865,18 @@ class UserThirdRepository extends BaseRepository
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加贡献记录
             log::info("===添加完积分和贡献值");
 
+            // 添加pv记录
+            $pv_data = [
+                "uid"           =>$user_id,
+                "pv"            =>$gongxian,
+                "addtime"       =>time(),
+                "status"        =>-1,
+                "order_type"    =>$type_shop,
+                "order_id"      =>$order_sn,
+                "mark"          =>"购买{$make}商品获得的PV",
+            ];
+            Db::name("user_pv_log")->insert($pv_data);//添加pv记录
+
             //判断是否是老用户  is_old=1是1.0的用户，1.0的用户要总pv*45%的红包
             if($user["is_old"]==1){
                 //添加红包