Merge branch 'dev-xpy' into dev

app/common/repositories/finance/FinanceRepository.php

@@ -1953,7 +1953,6 @@ class FinanceRepository extends BaseRepository
         $query = Db::name('user_pv_log')
         ->alias('uss')
         ->leftJoin('user u', 'u.uid=uss.uid')
-        ->leftJoin('store_order o', 'o.order_id=uss.order_id')
         ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
             $query->where('uss.uid', $params['uid']);
         })
@@ -1978,8 +1977,8 @@ class FinanceRepository extends BaseRepository
         $is_excel = request()->param('is_excel', 0);
         if($is_excel == 1){
             $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,o.order_sn,uss.status,uss.mark,u.score')
-            ->order('uss.id', 'desc')
+                ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,uss.order_id,uss.status,uss.mark,u.score')
+                ->order('uss.id', 'desc')
             ->select();
             $arr = [];
             foreach ($date['list'] as $k=>$item){
@@ -2001,13 +2000,14 @@ class FinanceRepository extends BaseRepository
                     $item['phone'],
                     $item['pv'],
                     $item['status'],
-                    $item['order_sn'],
+                    $item['order_id'],
                     $item['mark']
                 );
             }
             return $this->getStatisticsExcel([
-                'ID','时间','用户昵称','手机号','PV数','状态','关联订单','说名',
+                'ID','时间','用户昵称','手机号','PV数','状态','关联订单ID','说明',
             ], $arr, 'PV统计');
+
         }
 
 

app/common/repositories/user/UserRepository.php

@@ -3131,6 +3131,9 @@ class UserRepository extends BaseRepository
         $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
         //被推荐人信息
         $identity=Db::name("user")->where('uid',$uid)->field("identity,spread_uid")->find();
+        if (!$spread) {
+            return ['success' => false, 'msg' => '推荐人信息不存在'];
+        }
 //        $user_identity_log=Db::name("user_identity_log")->where(["link_id"=>$uid])->find();
         if($spread){
             try{
@@ -3164,6 +3167,9 @@ class UserRepository extends BaseRepository
 
     public function update_level_uid($uid, $olld_id, $level_account, $mark,$adminId){
         $level = Db::name("user")->where('account',$level_account)->field("uid,account")->find();
+        if (!$level) {
+            return ['success' => false, 'msg' => '节点人信息不存在'];
+        }
         if($level){
             try{
                 Db::name("user_level_change_records")->insert([