From 4ea1759b20f6a3eee6065d35858d62fbc2c0cf69 Mon Sep 17 00:00:00 2001
From: heyuntao <heyuntao@LAPTOP-MP4HD5NS>
Date: 星期五, 09 六月 2023 15:50:00 +0800
Subject: [PATCH] no message

---
 application/api/controller/Taoke.php |  102 ++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 89 insertions(+), 13 deletions(-)

diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index 497150f..2f08b73 100644
--- a/application/api/controller/Taoke.php
+++ b/application/api/controller/Taoke.php
@@ -21,13 +21,14 @@
 use app\api\logic\Album as LogicAlbum;
 use app\api\logic\AlbumFollow as LogicAlbumFollow;
 use app\api\logic\Banner as LogicBanner;
+use think\log;
 
 /**
  * 娣樺鎺ュ彛
  */
 class Taoke extends Api
 {
-    protected $noNeedLogin = ['get_top_class','get_m','get_super_class','get_homemenu','getMQD','get_goods_things','get_talent_info','get_talent_article','get_goods_details','get_similar_info','hot_key','get_jd_detail','get_pdd_single_page','get_wph_detail','suggestion','goods_search','bd_homemenu','city_cate','searchd_deals','seckill_list','identify_goods','tb_goods_list','super_discount_goods','cate_rank_list','get_album_list','like_album','album_detail','get_dy_detail'];
+    protected $noNeedLogin = ['get_hdk_category_list','get_top_class','get_m','get_super_class','get_homemenu','getMQD','get_goods_things','get_talent_info','get_talent_article','get_goods_details','get_similar_info','hot_key','get_jd_detail','get_pdd_single_page','get_wph_detail','suggestion','goods_search','bd_homemenu','city_cate','searchd_deals','seckill_list','identify_goods','tb_goods_list','super_discount_goods','cate_rank_list','get_album_list','like_album','album_detail','get_dy_detail'];
     protected $noNeedRight = '*';
 
    
@@ -66,6 +67,18 @@
         $this->success('鑾峰彇鎴愬姛',$info);
     }
 
+  /**
+     * 鑾峰彇濂藉崟搴撳崟椤电被鐩垪琛�
+     * 
+     * 
+     */
+    public function get_hdk_category_list()
+    {
+        $type = request()->param('type',4);
+        $LogicHaodanku=new LogicHaodanku();
+        $list=$LogicHaodanku->getCateList($type);
+        $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
+    }
 
     /**
      * 鑾峰彇瓒呯骇鍒嗙被
@@ -77,6 +90,23 @@
         $LogicSuperClass = new LogicSuperClass();
         $list = $LogicSuperClass->getList();
         $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
+    }
+    
+     /**
+     * 鑾峰彇鏈嬪弸鍦堢礌鏉�
+     *
+     * @return void
+     */
+    public function friends_circle_list()
+    {
+        $page = request()->param('pageId');
+        $pageSize = request()->param('pageSize');
+        $cid = request()->param('cid');
+        $sort = request()->param('sort');
+        $LogicDataoke = new LogicDataoke();
+        $list = $LogicDataoke->getFriendscircles($page,$pageSize,$cid,$sort);
+        $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
+
     }
 
     
@@ -169,9 +199,13 @@
             break; 
             case 5: //鐑帹姒�
                 $LogicDataoke = new LogicDataoke();
-                $list = $LogicDataoke->getRank(3,'',$page,$page_size);
+                $list = $LogicDataoke->getRank(8,'',$page,$page_size);
                 //$list = $LogicDingdanxia->wphGoodsList('',1,$page,$page_size,0);
-            break;  
+            break; 
+             case 6: //鎶栭煶
+                 $LogicHaodanku = new LogicHaodanku();
+                $list = $LogicHaodanku->getDygoodsList('','','',$page,$page_size);
+            break; 
         }
         $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
     }
@@ -285,10 +319,14 @@
             case 4: //鎶栭煶
                 $LogicHaodanku = new LogicHaodanku();
                 $info = $LogicHaodanku->idPrivilege($goods_id,$common_relation_id);
-		$info['dy_deeplink'] = $info['dy_zlink'];
+                if(!empty($info['dy_zlink']))
+                {
+                    $info['dy_deeplink'] = $info['dy_zlink'];
+                }
+		        
             break;  
         }
-
+        
         if($info === false) $this->error('杞摼澶辫触');
 
         $this->success('鑾峰彇鎴愬姛',['info'=>$info]);
@@ -304,9 +342,13 @@
 
         if(empty($goods_id)) $this->error('鍟嗗搧id涓嶈兘涓虹┖');
 
-        $LogicHaodanku = new LogicHaodanku();
+        // $LogicHaodanku = new LogicHaodanku();
 
-        $list = $LogicHaodanku->getSimilarInfo($goods_id,10);
+        // $list = $LogicHaodanku->getSimilarInfo($goods_id,10);
+
+        $LogicDataoke=new LogicDataoke();
+        $list=$LogicDataoke->getSimilarInfo($goods_id,10);
+
 
         if($list === false) $this->error($LogicHaodanku->getError());
 
@@ -524,7 +566,8 @@
                 $list = $LogicDingdanxia->searchGoods($keyword,$fieldName,$order,$page,$page_size,'wph','w');
                 break;
             case 'dy':
-                $sort_type = 0;
+               $sort_type = 0;
+                $catId = request()->param('catid','');
                 if($sort != 'renqi'){
                     $sort = explode("_",$sort);
                     if(count($sort) == 2){ //浠锋牸
@@ -534,7 +577,7 @@
                     }
                 }
                 $LogicHaodanku = new LogicHaodanku();
-                $list = $LogicHaodanku->getDygoodsList('',$keyword,$sort_type,$page,$page_size);
+                $list = $LogicHaodanku->getDygoodsList($catId,$keyword,$sort_type,$page,$page_size);
                 break;
 
         }
@@ -832,7 +875,7 @@
 
          /*---鍏煎瀹㈡埛绔�----*/
          $info['wx_qrcode_url'] = $info['we_app_info']['miniCode'];
-         $info['app_id'] = $info['we_app_info']['app_id'];
+         $info['app_id'] = $info['original_id'];
          $info['wx_miniprogram_path'] = $info['we_app_info']['page_path'];
          $info['click_url'] = $info['h5'];
 
@@ -1035,6 +1078,8 @@
     public function identify_goods()
     {
         $goods_url = request()->param('goods_url','', 'urldecode');
+        
+        log::write('鏅鸿兘鎼滅储鍐呭'.$goods_url);
 
         if (empty($goods_url)) $this->error('閾炬帴涓嶈兘涓虹┖');
 
@@ -1055,17 +1100,19 @@
 
         $subcid = request()->param('subcid','');
 
-       if(empty($cateId) && empty($subcid)) $this->error('鍒嗙被ID涓嶈兘涓虹┖');
+       //if(empty($cateId) && empty($subcid)) $this->error('鍒嗙被ID涓嶈兘涓虹┖');
 
         $page = request()->param('page',1);
 
         $page_size = request()->param('pageSize',10);
 
         $sort = request()->param('sort',0);
+        
+        $tchaoshi=request()->param('tchaoshi',0);
 
         $LogicDataoke = new LogicDataoke();
 
-        $list = $LogicDataoke->getGoodsList($cateId,$subcid,$sort,$page,$page_size);
+        $list = $LogicDataoke->getGoodsList($cateId,$subcid,$sort,$page,$page_size,$tchaoshi);
 
         if($list === false) $this->error($LogicDataoke->getError());
 
@@ -1148,7 +1195,13 @@
                     $info = "";
                 }else{
                     $resLink = $LogicHaodanku->idPrivilege($res['goods_id'],$common_relation_id);
-                    $info = empty($resLink) ? "" : $resLink['dy_zlink'];
+                    if(empty($resLink))
+                    {
+                        $info ="";
+                    }
+                    else{
+                        $info = empty($resLink['dy_zlink']) ? $resLink['dy_deeplink'] : $resLink['dy_zlink'];
+                    }
                 }
             break;     
         }
@@ -1288,4 +1341,27 @@
         $this->success('鑾峰彇鎴愬姛',['list' => $list]);
     }
 
+    /**
+     * 0鍏冭喘鍟嗗搧鍒楄〃锛堣皟鐢�9.9鍖呴偖绮鹃�夋帴鍙o紝鑾峰彇3.9鍏冨晢鍝侊級
+     * 
+     * @return void
+     */
+    public function get_first_free_goods(){
+
+        $page = request()->param('page',1);
+        $page_size = request()->param('pageSize',40);
+        $LogicDataoke = new LogicDataoke();
+
+        $list = $LogicDataoke->getOpGoodsList(1,$page,$page_size);
+
+        if($list === false) $this->error($LogicDataoke->getError());
+
+        foreach($list as $key => $value){
+            $list[$key]['fanli'] = $value['actualPrice'];
+        }
+       // $list= array_slice($list, 0, 40);
+
+        $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
+    }
+
 }

--
Gitblit v1.9.3