1113更新，商品采集，会员的3355制

app/common/repositories/user/UserRepository.php

@@ -941,15 +941,15 @@ class UserRepository extends BaseRepository
      * @author xaboy
      * @day 2020-04-28
      */
-    public function create(string $type, array $userInfo, $url=0)
+    public function create(string $type, array $userInfo, $url=0,$spread_uid=null)
     {
         $userInfo['user_type'] = $type;
         Db::startTrans();
         try {
 
 
-            $user = $this->dao->create($userInfo);
-//            $this -> insterUser($user->uid, $url);
+            $user = $this->dao->create($userInfo); //创建用户
+            $this -> insterUser($user->uid, $spread_uid);
             //唯品会pid
 //            $vip = app()->make(Vip::class);
 //            $vip->create_pid($user->uid);
@@ -965,6 +965,7 @@ class UserRepository extends BaseRepository
             Db::commit();
             return $user;
         } catch (\Exception $e) {
+            Log::info($userInfo);
             Db::rollback();
             log::info("注册失败".$e->getFile().'：'.$e->getLine().'【'.$e->getMessage().'】');
             throw new AuthException('注册失败');
@@ -998,22 +999,26 @@ class UserRepository extends BaseRepository
 
 
         }
+        // Log::info("userCount:::");
+        // Log::info($userCount);
+        // Log::info($spread_uid);
+
         Db::name('log')->insert(['data'=>'uid：'.$uid.'公排注册：'.json_encode($userCount)]);
         if (!$userCount){
             //没有直推上级 大公排
-//            $userCount = Db::name('user_count') -> where('level_number >= 0') -> find();
+            $userCount = Db::name('user_count') -> where('level_number >= 0') -> find();
             //增加一个只查询新账户大公排下的用户
-            $userCount = Db::name('user_count') -> where('level_number >= 0')->whereIn('uid',$this->getUserLevelId(11112)) -> find();
+            // $userCount = Db::name('user_count') -> where('level_number >= 0')->whereIn('uid',$this->getUserLevelId(11112)) -> find();
         }
         if ($userCount) {
-            if ($userCount['level_number'] + 1 == 5) {
+            if ($userCount['level_number'] + 1 == systemConfig( 'max_level_number')) {  //（33制或者55制）下级最大人数systemConfig( 'max_level_number')
                 Db::name('user_count') -> where('uid',$userCount['uid'])->delete();
             } else {
                 $level_number = $userCount['level_number'] + 1;
                 Db::name('user_count') -> where('uid',$userCount['uid']) -> update(['level_number'=>$level_number]);
             }
         }
-
+        // dd($spread_uid);
         Db::name('user') -> where('uid',$uid)->update(['level_id'=>$userCount['uid'],'level'=>$this->level()]);
         Db::name('user_count') -> insert(['uid'=>$uid]);
     }
@@ -1174,7 +1179,8 @@ class UserRepository extends BaseRepository
         return $key;
     }
 
-    public function registr(string $phone, ?string $pwd, $user_type = 'h5',$url="",$nickname="",$external=1)
+    //$repository->registr($data['phone'], $data['password'],'APP',"","",$data['spread']);
+    public function registr(string $phone, ?string $pwd, $user_type = 'h5',$url="",$nickname="",$external=1,$spread_uid=null)
     {
 
         $pwd = $pwd ? $this->encodePassword($pwd) : $this->encodePassword($this->dao->defaultPwd());
@@ -1186,9 +1192,10 @@ class UserRepository extends BaseRepository
             'phone' => $phone,
             'last_ip' => app('request')->ip(),
             "identity"=>5,
-            "external"=>$external
+            "external"=>$external,
+            "spread_uid"=>$spread_uid
         ];
-        return $this->create($user_type, $data, $url);
+        return $this->create($user_type, $data, $url,$spread_uid);
     }
     public function addregistr($data)
     {

app/controller/admin/user/User.php

@@ -1281,7 +1281,7 @@ class User extends BaseController
             if($v['b'] && $v['b']!=null && $v['b']!=''){
                 $pid=Db::name('user')->where('account',$v['b'])->value('uid');
                 if($pid){
-                    $repository->bindSpread($user, intval($pid));
+                    $repository->bindSpread($user, intval($pid)); //绑定上下级关系
                     $spread_uid=$pid;
                 }
             }

app/controller/api/Auth.php

@@ -479,6 +479,10 @@ echo '导入成功';
      */
     public function register(UserAuthValidate $validate, UserRepository $repository)
     {
+
+        // $repository->insterUser(16328, 14395);
+
+        // return "=====";
         $data = $this->request->params(['phone', 'sms_code', 'spread', 'password',"spread_phone","type","mer_id"]);
         $type=$data['type']??'';
         unset($data['type']);
@@ -502,8 +506,9 @@ echo '导入成功';
                 return app('json')->fail('推荐人手机号填写错误');
             }
         }
-
-        $user = $repository->registr($data['phone'], $data['password'],'APP',$data['spread']);
+        // Log::info($data);
+        $user = $repository->registr($data['phone'], $data['password'],'APP',"","",1,$data['spread']);
+        // $repository->registr($data['phone'], $data['password'],'APP',$data['spread']);
         $repository->addagent($user);
         $user = $repository->mainUser($user);
 

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

@@ -76,9 +76,9 @@ class Douyin extends BaseController
 
 
                     // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
-                    if ($yanglaojin < 0.1) {
-                        continue;
-                    }
+                    // if ($yanglaojin < 0.1) {
+                    //     continue;
+                    // }
                     Log::info($value);
                     // $yanglaojin = bcmul($yanglaojin, 0.8, 2);
                     $goods = [

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

@@ -67,12 +67,41 @@ class Jt extends BaseController
         if ($type == 1){
             $limit = 100;
         }
-        $list = Db::name('third_party_goods')
-            -> where('type',2)
-            -> page($page,$limit)
-            -> field('json')
-            -> select()
-            -> toArray();
+
+        $keyword = request()->param('keyword', '');
+        $_cid = request()->param('cid', '');
+
+        [$page, $limit] = $this->getPage();
+        
+
+        $goods_obj = Db::name('third_party_goods')
+        -> where('type',2);
+        // -> when(!empty($keyword),function($query) use ($keyword) {
+        //     $query -> where('json',"like",'%'.$keyword.'%');
+        // })
+        // -> page($page,$limit)
+        // -> field('json')
+        // -> select()
+        // -> toArray();
+    
+        if($keyword){
+            $goods_obj=$goods_obj->where('json', 'like', '%' . $keyword . '%');
+        }
+        if($_cid){
+            $goods_obj=$goods_obj->where('cid', $_cid);
+        }
+        $list=$goods_obj->page($page, $limit)
+            ->select()->toArray();
+
+
+
+
+        // $list = Db::name('third_party_goods')
+        //     -> where('type',2)
+        //     -> page($page,$limit)
+        //     -> field('json')
+        //     -> select()
+        //     -> toArray();
         $formatList = [];
         foreach ($list as $value){
             $json = json_decode($value['json'],true);
@@ -233,12 +262,12 @@ class Jt extends BaseController
             $commissionMoney = sprintf('%.2f', ($finalPrice * $commissionRate / 100)); // 商品最终价格 * 京推推商品佣金比率 /100 =最终佣金
 
             $pv=$commissionMoney* 0.5;  //PV
-            $oldMoney=$pv*0.05; //新的养老金
+            $yanglaojin=$pv*0.05; //新的养老金
 
             
             //养老金
             // $oldMoney = app()->make(ProductRepository::class)->yanglaojin(0, $commissionMoney);
-            if ($oldMoney < 0.1) continue;
+            // if ($yanglaojin < 0.1) continue;
             $couponMoney = [
                 [
                     'discount' => $value['discount_price'],//优惠券金额
@@ -259,7 +288,7 @@ class Jt extends BaseController
                 'yanglaojin'=>$yanglaojin,
 
 
-                'commission' => $oldMoney,//养老金
+                'commission' => $yanglaojin,//养老金
                 'commission_rate' => $commissionRate,
                 // 'sales' => $value['inOrderCount30Days'],
                 'coupon_money' => $couponMoney,//优惠券相关信息
@@ -291,9 +320,9 @@ class Jt extends BaseController
 
             Db::name("third_party_goods") -> insert([
                 'json'=>json_encode($formatList,JSON_UNESCAPED_UNICODE),
-                'pension'=>$oldMoney,
+                'pension'=>$yanglaojin,
                 'type'=>2,                
-                'cid'=>cid //一级分类
+                'cid'=>$cid //一级分类
             ]);  //20250110 增加cid字段，json中增加 shopName,monthSales by Conner
         }
 //        return $formatList;

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

@@ -169,13 +169,13 @@ 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=$commission* 0.5;  //PV
-                    $yanglaojin=$pv*0.05; //新的养老金
+                    $pv=round($commission* 0.5,2);  //PV
+                    $yanglaojin=round($pv*0.05,2); //新的养老金
 
 
-                    if($yanglaojin < 0.1) {
-                        continue;
-                    }
+                    // if($yanglaojin < 0.1) {
+                    //     continue;
+                    // }
 
                     //记录分类id到本地数据库
                     $cid=$goods['categoryInfo']['firstSaleCategoryId'];
@@ -195,7 +195,7 @@ class Su extends BaseController
                         'yanglaojin' => $yanglaojin,//养老金
 
 
-                        'commission' => $yanglaojin,//养老金
+                        'commission' => $commission,//佣金
 
                         'commission_rate' => $goods['commodityInfo']['rate'] ?? '',//佣金比例
                         'sales' => $goods['commodityInfo']["monthSales"],

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

@@ -175,6 +175,7 @@ class TaoKe extends BaseController
             return app('json')->success('未查询到商品', []);
         }
 
+        Log::info($params);
 
         $apiName = 'pdd.ddk.goods.search';
         $result = $this->getUrlResult($apiName, $params);
@@ -182,7 +183,13 @@ class TaoKe extends BaseController
         if (!$goodsResult) {
             return app('json')->success('未查询到商品', []);
         }
+
+
+
         $goodsList = [];
+
+        // Log::info($goodsResult);
+        
         foreach ($goodsResult as $goods) {
             //var_dump($goods);
             $min_normal_price = sprintf('%.2f', $goods['min_normal_price'] / 100);
@@ -200,47 +207,54 @@ class TaoKe extends BaseController
 
             $pv=$commission* 0.5;  //PV
             $yanglaojin=$pv*0.05; //新的养老金
-
-            if($yanglaojin < 0.1) {
-                continue;
-            }
+            Log::info("养老金：".$yanglaojin);
+            // if($yanglaojin < 0.1) {
+            //     continue;
+            // }
 
             
+            try {
+                $current_goods= [
+                    'type' => 1,//拼多多商品
+                    'id' => $goods['goods_sign'] ?? $goods['goods_id'],
+                    'thumb' => $goods['goods_thumbnail_url'],//商品缩略图
+                    'name' => $goods['goods_name'],
+                    'commission' => $yanglaojin, //养老金  //app()->make(ProductRepository::class)->thirdYanglaojin(0, $commission),
+                    'commission_' => $commission,
+    
+                    'yanglaojin' => $yanglaojin,
+                    'pv' => $pv,
+                    'gongxian'=>$pv,
+                    'jifen'=>$pv,
+                    
+    
+                    'commission_rate' => $commissionRate,
+                    'sales' => $goods['sales_tip'],
+                    //'desc' => $goods['goods_desc'],
+                    'coupon_money' => $couponMoney,
+                    //'market_price' => $groupPrice,
+                    'market_price' => set_price_rtrim(sprintf('%.2f', $groupPrice - $couponMoney)),
+                    'price' => set_price_rtrim(sprintf('%.2f', $min_normal_price - $couponMoney)),
+    
+                    'shopName'=>$goods['mall_name'], //店铺名称
+                    'monthSales'=>$goods['sales_tip']>0?$goods['sales_tip']:mt_rand(100,10000) //月销量
+                ];
+                Log::info($current_goods);
+                $goodsList[] =$current_goods;
+                $cid=isset($goods['cat_ids'][0])?$goods['cat_ids'][0]:0;
+                // Db::name("third_party_goods")->insert([
+                //     'json' => json_encode($current_goods, JSON_UNESCAPED_UNICODE),
+                //     'type' => 3,
+                //     'pension' => $yanglaojin,
+                //     'cid'=>$cid //一级分类
+                // ]);
+            } catch (\Throwable $th) {
+                Log::error($th->getMessage());
+            }
             
-            $this_goods= [
-                'type' => 1,//拼多多商品
-                'id' => $goods['goods_sign'] ?? $goods['goods_id'],
-                'thumb' => $goods['goods_thumbnail_url'],//商品缩略图
-                'name' => $goods['goods_name'],
-                'commission' => $yanglaojin, //养老金  //app()->make(ProductRepository::class)->thirdYanglaojin(0, $commission),
-                'commission_' => $commission,
-
-                'yanglaojin' => $yanglaojin,
-                'pv' => $pv,
-                'gongxian'=>$pv,
-                'jifen'=>$pv,
-
-                'commission_rate' => $commissionRate,
-                'sales' => $goods['sales_tip'],
-                //'desc' => $goods['goods_desc'],
-                'coupon_money' => $couponMoney,
-//                'market_price' => $groupPrice,
-                'market_price' => set_price_rtrim(sprintf('%.2f', $groupPrice - $couponMoney)),
-                'price' => set_price_rtrim(sprintf('%.2f', $min_normal_price - $couponMoney)),
-
-                'shopName'=>$goods['mall_name'], //店铺名称
-                'monthSales'=>$goods['sales_tip']>0?$goods['sales_tip']:mt_rand(100,10000) //月销量
-            ];
-            $goodsList[] =$this_goods;
-            $cid=isset($goods['cat_ids'][0])?$goods['cat_ids'][0]:0;
-            Db::name("third_party_goods")->insert([
-                'json' => json_encode($this_goods, JSON_UNESCAPED_UNICODE),
-                'type' => 3,
-                'pension' => $yanglaojin,
-                'cid'=>$cid //一级分类
-            ]);
 
         }
+        
         shuffle($goodsList);
         return app('json')->success('获取拼多多商品列表成功', $goodsList);
     }
@@ -395,8 +409,19 @@ class TaoKe extends BaseController
             return ['code' => 0, 'data' => $result];
         }
         $commission = ($detail['min_group_price'] * $detail['promotion_rate']) / 1000 / 100;
-        $detail['yanglao'] = app()->make(ProductRepository::class)
-            ->thirdYanglaojin(0, sprintf('%.2f', $commission));
+        // $detail['yanglao'] = app()->make(ProductRepository::class)
+        //     ->thirdYanglaojin(0, sprintf('%.2f', $commission));
+        
+            $pv=$commission* 0.5;  //PV
+            $yanglaojin=$pv*0.05; //新的养老金
+        
+        $gongxian=$pv;
+        $jifen=$pv;
+        $detail['yanglaojin'] =$yanglaojin;
+        $detail['pv'] =$pv;
+        $detail['gongxian'] =$gongxian;
+        $detail['jifen'] =$jifen;
+
         $detail['pddlink'] = $this->pdd_promotelink($goodsId, $thirdInfo);
         $detail['min_normal_price'] = $detail['min_normal_price'] - $detail['coupon_discount'];
         $detail['min_group_price'] = $detail['min_group_price'] - $detail['coupon_discount'];

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

@@ -175,9 +175,9 @@ class Vip extends BaseController
 
 
                     // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
-                    if($yanglaojin < 0.1) {
-                        continue;
-                    }
+                    // if($yanglaojin < 0.1) {
+                    //     continue;
+                    // }
 
                     
                     //记录分类id到本地数据库
@@ -288,8 +288,27 @@ class Vip extends BaseController
     public function vip_goods()
     {
         [$page, $limit] = $this->getPage();
+
+        $keyword = $this->request->param('keyword');
+        $_cid = $this->request->param('cid');
+
+
+        
+        $goods_obj = Db::name('third_party_goods')
+            ->where('type', 5);
+        if($keyword){
+            $goods_obj=$goods_obj->where('json', 'like', '%' . $keyword . '%');
+        }
+        if($_cid){
+            $goods_obj=$goods_obj->where('cid', $_cid);
+        }
+        $data=$goods_obj->page($page, $limit)
+            ->select()->toArray();
+
+
+
         // 获取列表数据
-        $data = Db::name('third_party_goods')->where('type', 5)->page($page, $limit)->select()->toArray();
+        // $data = Db::name('third_party_goods')->where('type', 5)->page($page, $limit)->select()->toArray();
         $goodslist = [];
         if (!empty($data)) {
             foreach ($data as $value) {