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 | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index f0c3cef..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);
@@ -1120,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);
@@ -1134,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());
@@ -1450,24 +1488,21 @@
case 'tb': //娣樺疂鑱旂洘
$LogicDataoke = new LogicDataoke();
$clist = $LogicDataoke->getGoodsList($cids[$page-1],'',0,$page,$page_size,1,0);
- $clist=array_slice($clist, 0, 3);
break;
case 'jd': //浜笢
$LogicJd = new LogicJd();
- $jd_id_list = $LogicJd->search_cid_Goods('','desc','','','inOrderCount30Days',$new_page,10,$cids[$page-1]);
- $clist=array_slice($jd_id_list, 0, 3);
+ $clist = $LogicJd->search_cid_Goods('','desc','','','inOrderCount30Days',1,10,$cids[$page-1]);
break;
case 'pdd': //鎷煎澶�
$LogicPdd = new LogicPdd();
- $pdd_list = $LogicPdd->searchGoods('','',$common_relation_id,'',1,10,0,$cids[$page-1]);
- $clist=array_slice($pdd_list, 0, 3);
+ $clist = $LogicPdd->searchGoods('','',$common_relation_id,'',1,10,0,$cids[$page-1]);
break;
case'dy'://鎶栭煶
$LogicHaodanku = new LogicHaodanku();
- $dy_list = $LogicHaodanku->getDygoodsList($cids[$key],'',0,1,10);
- $clist=array_slice($dy_list, 0, 3);
+ $clist = $LogicHaodanku->getDygoodsList($cids[$key],'',0,1,10);
break;
}
+ $clist=array_slice($clist, 0, 3);
$n_count=$n_count-count($clist);
}
if(empty($platefrom)){
@@ -1476,7 +1511,7 @@
switch($platefrom){
case "tb": //娣樺疂鑱旂洘
$LogicTaobaolianmeng = new LogicTaobaolianmeng();
- $list = $LogicTaobaolianmeng->material('6708','','',$page,$page_size);
+ $list = $LogicTaobaolianmeng->material('6708','','OAID',$page,$page_size);
break;
case "jd": //浜笢
$LogicJd = new LogicJd();
@@ -1498,7 +1533,7 @@
}
$list=array_slice($list, 0, $n_count);
if(!empty($clist)){
- array_unshift($list,$clist);
+ $list=array_merge($clist,$list);
}
$this->success('鑾峰彇鎴愬姛',['list'=>$list]);
}
--
Gitblit v1.9.3