From d8a642f8fd82197c6b546aa08089bdc802f097f6 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 31 七月 2023 10:37:23 +0800
Subject: [PATCH] Merge tag '猜你喜欢修复' into develop
---
application/api/controller/Taoke.php | 131 +++++++++++++------------------------------
1 files changed, 40 insertions(+), 91 deletions(-)
diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index a47c9b4..076ed41 100644
--- a/application/api/controller/Taoke.php
+++ b/application/api/controller/Taoke.php
@@ -1442,111 +1442,60 @@
$user = $this->auth->getUser();
$common_relation_id = $user['common_relation_id'];
$list = [];
- if($page<3&&!empty($cids)){
+ $clist=[];
+ $cids = explode(',',$cids);
+ $n_count=10;
+ if($page<=count($cids)&&count($cids)>0){
switch($platefrom){
case 'tb': //娣樺疂鑱旂洘
$LogicDataoke = new LogicDataoke();
- $list = $LogicDataoke->getGoodsList($cids,'',0,$page,$page_size,1,0);
+ $clist = $LogicDataoke->getGoodsList($cids[$page-1],'',0,$page,$page_size,1,0);
break;
case 'jd': //浜笢
$LogicJd = new LogicJd();
- //灏嗕互閫楀彿鍒嗛殧cids瀛楃涓茶浆鎴愭暟缁�
- $cids = explode(',',$cids);
- $new_page=1;
- while(count($list)<20){
- foreach($cids as $key=>$value){
- $jd_id_list = $LogicJd->search_cid_Goods('','desc','','','inOrderCount30Days',$new_page,5,$cids[$key]);
- //灏嗗涓猨d_id_list鏁扮粍鍚堝苟鎴愪竴涓暟缁�
- $list = array_merge($list,$jd_id_list);
- }
- $new_page=$new_page+1;
- }
- //濡傛灉page=1锛屽垯鍙�$list鏁扮粍鐨勫墠10涓�
- if($page==1){
- $list= array_slice($list, 0, 10);
- }
- log::write('鐚滀綘鍠滄鏃ュ織璋冭瘯:'.count($list));
- //濡傛灉page=2锛屽垯鍙�$list鏁扮粍鐨勭11涓埌绗�20涓�
- if($page==2){
- $list= array_slice($list, 10, 10);
- }
+ $clist = $LogicJd->search_cid_Goods('','desc','','','inOrderCount30Days',$new_page,10,$cids[$page-1]);
break;
case 'pdd': //鎷煎澶�
$LogicPdd = new LogicPdd();
- //灏嗕互閫楀彿鍒嗛殧cids瀛楃涓茶浆鎴愭暟缁�
- $cids = explode(',',$cids);
- $new_page=1;
- while(count($list)<20){
- foreach($cids as $key=>$value){
- $jd_id_list = $LogicPdd->searchGoods('','',$common_relation_id,'',1,10,0,$cids[$key]);
- //灏嗗涓猨d_id_list鏁扮粍鍚堝苟鎴愪竴涓暟缁�
- $list = array_merge($list,array_slice($jd_id_list, 0, 5));
- }
- $new_page=$new_page+1;
- }
- //濡傛灉page=1锛屽垯鍙�$list鏁扮粍鐨勫墠10涓�
- if($page==1){
- $list= array_slice($list, 0, 10);
- }
- //濡傛灉page=2锛屽垯鍙�$list鏁扮粍鐨勭11涓埌绗�20涓�
- if($page==2){
- $list= array_slice($list, 10, 10);
- }
+ $clist = $LogicPdd->searchGoods('','',$common_relation_id,'',1,10,0,$cids[$page-1]);
break;
case'dy'://鎶栭煶
$LogicHaodanku = new LogicHaodanku();
- //灏嗕互閫楀彿鍒嗛殧cids瀛楃涓茶浆鎴愭暟缁�
- $cids = explode(',',$cids);
- $new_page=1;
- while(count($list)<20){
- foreach($cids as $key=>$value){
- $jd_id_list = $LogicHaodanku->getDygoodsList($cids[$key],'',0,1,5);
- //灏嗗涓猨d_id_list鏁扮粍鍚堝苟鎴愪竴涓暟缁�
- $list = array_merge($list,$jd_id_list);
- }
- $new_page=$new_page+1;
- }
- //濡傛灉page=1锛屽垯鍙�$list鏁扮粍鐨勫墠10涓�
- if($page==1){
- $list= array_slice($list, 0, 10);
- }
- //濡傛灉page=2锛屽垯鍙�$list鏁扮粍鐨勭11涓埌绗�20涓�
- if($page==2){
- $list= array_slice($list, 10, 10);
- }
- break;
+ $clist = $LogicHaodanku->getDygoodsList($cids[$key],'',0,1,10);
+ break;
}
+ $clist=array_slice($clist, 0, 3);
+ $n_count=$n_count-count($clist);
}
- else{
- if(empty($platefrom)){
- $platefrom='tb';
- }
- else{
- $page=$page-2;
- }
- switch($platefrom){
- case "tb": //娣樺疂鑱旂洘
- $LogicTaobaolianmeng = new LogicTaobaolianmeng();
- $list = $LogicTaobaolianmeng->material('6708','','',$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;
- }
+ 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]);
}
--
Gitblit v1.9.3