From 6c7bba2e05c011a3d640b6565a113204228e92e0 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期六, 07 十月 2023 10:58:36 +0800
Subject: [PATCH] Merge tag '首页猜你喜欢修复' into develop
---
application/api/controller/Taoke.php | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 201 insertions(+), 13 deletions(-)
diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index 1a8c3f8..c5ececb 100644
--- a/application/api/controller/Taoke.php
+++ b/application/api/controller/Taoke.php
@@ -28,7 +28,7 @@
*/
class Taoke extends Api
{
- 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 $noNeedLogin = ['wx_get_goods_things','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 = '*';
@@ -171,6 +171,44 @@
$this->success('鑾峰彇鎴愬姛',$data);
}
+ public function wx_get_goods_things(){
+ // $this->success('鑾峰彇鎴愬姛',['list'=>[]]);
+ $type = request()->param('type',1);
+ $page = request()->param('pageId',1);
+ $page_size = request()->param('pageSize',10);
+ $deviceValue = request()->param('deviceValue','');
+ $deviceType = request()->param('deviceType','');
+ $list = [];
+ switch($type){
+ case 1: //娣樺疂鑱旂洘
+ $LogicTaobaolianmeng = new LogicTaobaolianmeng();
+ $list = $LogicTaobaolianmeng->material('6708',$deviceValue,$deviceType,$page,$page_size);
+ break;
+ case 2: //浜笢
+ $LogicJd = new LogicJd();
+ $list = $LogicJd->getTodayTop('discountReal',$page,$page_size);
+ break;
+ case 3: //鎷煎澶�
+ $LogicPdd = new LogicPdd();
+ $list = $LogicPdd->dailyExplosion('','[7,10851]',4,$page,$page_size);
+ $list = isset($list['list']) ? $list['list'] : [];
+ break;
+ case 4: //鍞搧浼�
+ $LogicDingdanxia = new LogicDingdanxia();
+ $list = $LogicDingdanxia->wphGoodsList('',1,$page,$page_size,0);
+ break;
+ case 5: //鐑帹姒�
+ $LogicDataoke = new LogicDataoke();
+ $list = $LogicDataoke->getRank(8,'',$page,$page_size);
+ //$list = $LogicDingdanxia->wphGoodsList('',1,$page,$page_size,0);
+ break;
+ case 6: //鎶栭煶
+ $LogicHaodanku = new LogicHaodanku();
+ $list = $LogicHaodanku->getDygoodsList('','','',$page,$page_size);
+ break;
+ }
+ $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
+ }
public function get_goods_things(){
$type = request()->param('type',1);
@@ -398,8 +436,9 @@
if(empty($goods_sign)) $this->error('鍟嗗搧sign涓嶈兘涓虹┖');
$LogicPdd = new LogicPdd();
-
- $info = $LogicPdd->getGoodsDetail($goods_sign);
+ $ModelUser = new ModelUser();
+ $user = $ModelUser->get(USERID);
+ $info = $LogicPdd->getGoodsDetail($goods_sign,true,$user['common_relation_id']);
if($info === false) $this->error($LogicPdd->getError());
@@ -678,12 +717,24 @@
$page_size = request()->param('pageSize',10);
- if(empty($nineCid)) $this->error('绫荤洰id涓嶈兘涓虹┖');
+ $plat=request()->param('plat','tb');
+
+ if($plat=='tb'&&empty($nineCid)) $this->error('绫荤洰id涓嶈兘涓虹┖');
$LogicDataoke = new LogicDataoke();
-
- $list = $LogicDataoke->getOpGoodsList($nineCid,$page,$page_size);
-
+ $list=null;
+ switch($plat)
+ {
+ case 'tb':
+ $list = $LogicDataoke->getOpGoodsList($nineCid,$page,$page_size);
+ break;
+ case 'jd':
+ $list = $LogicDataoke->jdNine($page,$page_size);
+ break;
+ default:
+ $list = $LogicDataoke->getOpGoodsList($nineCid,$page,$page_size);
+ break;
+ }
if($list === false) $this->error($LogicDataoke->getError());
$this->success('鑾峰彇鎴愬姛',['list'=>$list]);
@@ -710,7 +761,7 @@
$this->success('鑾峰彇鎴愬姛',['list'=>$list]);
}
-
+
/**
* 杈ｅ浼橀��
*/
@@ -1107,7 +1158,7 @@
$cateId = request()->param('cateId','');
$subcid = request()->param('subcid','');
-
+ $couponPriceLowerLimit=request()->param('couponPriceLowerLimit','');
//if(empty($cateId) && empty($subcid)) $this->error('鍒嗙被ID涓嶈兘涓虹┖');
$page = request()->param('page',1);
@@ -1121,7 +1172,7 @@
$secrend_search=request()->param('secrend_search',0);
$LogicDataoke = new LogicDataoke();
- $list = $LogicDataoke->getGoodsList($cateId,$subcid,$sort,$page,$page_size,$tchaoshi,$secrend_search);
+ $list = $LogicDataoke->getGoodsList($cateId,$subcid,$sort,$page,$page_size,$tchaoshi,$secrend_search,$couponPriceLowerLimit);
if($list === false) $this->error($LogicDataoke->getError());
@@ -1358,19 +1409,156 @@
public function get_first_free_goods(){
$page = request()->param('page',1);
- $page_size = request()->param('pageSize',40);
+ $page_size = request()->param('pageSize',100);
$LogicDataoke = new LogicDataoke();
- $list = $LogicDataoke->getOpGoodsList(1,$page,$page_size);
+ $list = $LogicDataoke->getOpGoodsList(1,$page,$page_size,['6','7','11','12','13']);
+ //濡傛灉涓嶆弧瓒�40涓紝鍒欏啀鍙栦竴椤�
+ if(count($list)<40){
+ $list2 = $LogicDataoke->getOpGoodsList(1,$page+1,$page_size,['6','7','11','12','13']);
+ $list = array_merge($list,$list2);
+ }
if($list === false) $this->error($LogicDataoke->getError());
foreach($list as $key => $value){
$list[$key]['fanli'] = $value['actualPrice'];
}
- // $list= array_slice($list, 0, 40);
+ $list= array_slice($list, 0, 40);
$this->success('鑾峰彇鎴愬姛',['list'=>$list]);
}
+ /**
+ * 鎶栭煶0鍏冭喘鍟嗗搧鍒楄〃
+ *
+ * @return void
+ */
+ public function get_first_free_dy_goods(){
+
+ $page = request()->param('page',1);
+ $page_size = request()->param('pageSize',40);
+ $LogicHaodanku = new LogicHaodanku();
+
+ $list = $LogicHaodanku->getDyOnebyGood($page,$page_size);
+
+
+ if($list === false) $this->error($LogicHaodanku->getError());
+ $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
+ }
+
+ /**
+ * 浜笢0鍏冭喘鍟嗗搧鍒楄〃
+ *
+ * @return void
+ */
+ public function get_first_free_jd_goods()
+ {
+
+ $page = request()->param('page',1);
+
+ $page_size = request()->param('pageSize',40);
+
+ $LogicJd = new LogicJd();
+
+ $list = $LogicJd->getNineSift($page,$page_size);
+
+ $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
+ }
+
+ /**
+ * 鐚滀綘鍠滄
+ *
+ * @return void
+ */
+ public function gussess_like_goods()
+ {
+ $platefrom = request()->param('platefrom','');
+ $page = request()->param('pageId',1);
+ $page_size = request()->param('pageSize',10);
+ $cids= request()->param('cids','');
+ $user = $this->auth->getUser();
+ $common_relation_id = $user['common_relation_id'];
+ $list = [];
+ $clist=[];
+ $cids = explode(',',$cids);
+ $n_count=10;
+ if($page<=count($cids)&&count($cids)>0){
+ switch($platefrom){
+ case 'tb': //娣樺疂鑱旂洘
+ $LogicDataoke = new LogicDataoke();
+ $clist = $LogicDataoke->getGoodsList($cids[$page-1],'',0,$page,$page_size,1,0);
+ break;
+ case 'jd': //浜笢
+ $LogicJd = new LogicJd();
+ $clist = $LogicJd->search_cid_Goods('','desc','','','inOrderCount30Days',1,10,$cids[$page-1]);
+ break;
+ case 'pdd': //鎷煎澶�
+ $LogicPdd = new LogicPdd();
+ $clist = $LogicPdd->searchGoods('','',$common_relation_id,'',1,10,0,$cids[$page-1]);
+ break;
+ case'dy'://鎶栭煶
+ $LogicHaodanku = new LogicHaodanku();
+ $clist = $LogicHaodanku->getDygoodsList($cids[$key],'',0,1,10);
+ break;
+ }
+ $clist=array_slice($clist, 0, 3);
+ $n_count=$n_count-count($clist);
+ }
+ if(empty($platefrom)){
+ $platefrom='tb';
+ }
+ switch($platefrom){
+ case "tb": //娣樺疂鑱旂洘
+ $LogicTaobaolianmeng = new LogicTaobaolianmeng();
+ $list = $LogicTaobaolianmeng->material('6708','','OAID',$page,$page_size);
+ break;
+ case "jd": //浜笢
+ $LogicJd = new LogicJd();
+ $list = $LogicJd->getTodayTop('discountReal',$page,$page_size);
+ break;
+ case "pdd": //鎷煎澶�
+ $LogicPdd = new LogicPdd();
+ $list = $LogicPdd->dailyExplosion('','[7,10851]',4,$page,$page_size);
+ $list = isset($list['list']) ? $list['list'] : [];
+ break;
+ case "wph": //鍞搧浼�
+ $LogicDingdanxia = new LogicDingdanxia();
+ $list = $LogicDingdanxia->wphGoodsList('',1,$page,$page_size,0);
+ break;
+ case "dy": //鎶栭煶
+ $LogicHaodanku = new LogicHaodanku();
+ $list = $LogicHaodanku->getDygoodsList('','','',$page,$page_size);
+ break;
+ }
+ $list=array_slice($list, 0, $n_count);
+ if(!empty($clist)){
+ $list=array_merge($clist,$list);
+ }
+ $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
+ }
+
+ /**
+ * 鍟嗗搧姣斾环
+ *
+ * @return void
+ */
+
+ public function compare_good(){
+ $content = request()->param('content','');
+ if (empty($content)) $this->error('鍐呭涓嶈兘涓虹┖');
+ $exclude_tb = request()->param('exclude_tb',0);
+ $exclude_jd = request()->param('exclude_jd',0);
+ $exclude_pdd = request()->param('exclude_pdd',0);
+ $exclude_dy = request()->param('exclude_dy',0);
+ $content = request()->param('content','');
+ $content = request()->param('content','');
+ $LogicSearch = new LogicSearch();
+ $user = $this->auth->getUser();
+ $common_relation_id = $user['common_relation_id'];
+ $info = $LogicSearch->compare_good($content,$common_relation_id,$exclude_tb,$exclude_jd,$exclude_pdd,$exclude_dy);
+ $this->success('鑾峰彇鎴愬姛',['list'=>$info]);
+
+ }
+
}
--
Gitblit v1.9.3