From fb0b25ca177a7fc85d42ef5bbcc6f4d19fe22d17 Mon Sep 17 00:00:00 2001
From: heyuntao <heyuntao@LAPTOP-MP4HD5NS>
Date: 星期二, 18 七月 2023 16:38:17 +0800
Subject: [PATCH] no message
---
application/api/logic/taoke/Search.php | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/application/api/logic/taoke/Search.php b/application/api/logic/taoke/Search.php
index 02562df..a80cda1 100644
--- a/application/api/logic/taoke/Search.php
+++ b/application/api/logic/taoke/Search.php
@@ -199,55 +199,55 @@
$dyGoods = array_filter($dyGoods,function($v){
return $v['monthSales'] > 0;
});
-
+ $goodsList=[];
$goodscount=count(array_slice($tmGoods,0,$pagesize))+count(array_slice($jdGoods,0,$pagesize))+count(array_slice($ppdGoodes,0,$pagesize))+count(array_slice($dyGoods,0,$pagesize))+count(array_slice($tmcsGoods,0,$pagesize));
if($goodscount<40){
//濡傛灉goodscount涓嶆弧瓒�20鍒欎粠澶╃尗鍟嗗搧閲岃ˉ瓒�20
$needcount=40-$goodscount+10;
if($exclude_tb==0){
- $newGoods =array_merge($newGoods,array_slice($tmGoods,0,$pagesize));
- $newGoods =array_merge($newGoods,array_slice($tmcsGoods,0,$pagesize));
+ $goodsList =array_merge($goodsList,array_slice($tmGoods,0,$pagesize));
+ $goodsList =array_merge($goodsList,array_slice($tmcsGoods,0,$pagesize));
}
if($exclude_jd==0){
- $newGoods =array_merge($newGoods,array_slice($jdGoods,0,$pagesize));
+ $goodsList =array_merge($goodsList,array_slice($jdGoods,0,$pagesize));
}
//鎸夌収浠锋牸鎺掑簭
- if(count($newGoods)>0){
- $sort1 = array_column($newGoods, 'actualPrice');
- array_multisort($sort1, SORT_ASC, $newGoods);
+ if(count($goodsList)>0){
+ $sort1 = array_column($goodsList, 'actualPrice');
+ array_multisort($sort1, SORT_ASC, $goodsList);
}
if($exclude_pdd==0){
- $newGoods =array_merge($newGoods,array_slice($ppdGoodes,0,$pagesize));
+ $goodsList =array_merge($goodsList,array_slice($ppdGoodes,0,$pagesize));
}
if($exclude_tb==0){
- $newGoods =array_merge($newGoods,array_slice($taobaoGoods,0,$needcount));
+ $goodsList =array_merge($goodsList,array_slice($taobaoGoods,0,$needcount));
}
if($exclude_dy==0){
- $newGoods =array_merge($newGoods,array_slice($dyGoods,0,$pagesize));
+ $goodsList =array_merge($goodsList,array_slice($dyGoods,0,$pagesize));
}
}
else{
if($exclude_tb==0){
- $newGoods =array_merge($newGoods,array_slice($tmGoods,0,$pagesize));
- $newGoods =array_merge($newGoods,array_slice($tmcsGoods,0,$pagesize));
+ $goodsList =array_merge($goodsList,array_slice($tmGoods,0,$pagesize));
+ $goodsList =array_merge($goodsList,array_slice($tmcsGoods,0,$pagesize));
}
if($exclude_jd==0){
- $newGoods =array_merge($newGoods,array_slice($jdGoods,0,$pagesize));
+ $goodsList =array_merge($goodsList,array_slice($jdGoods,0,$pagesize));
}
//鎸夌収浠锋牸鎺掑簭
- if(count($newGoods)>0){
- $sort1 = array_column($newGoods, 'actualPrice');
- array_multisort($sort1, SORT_ASC, $newGoods);
+ if(count($goodsList)>0){
+ $sort1 = array_column($goodsList, 'actualPrice');
+ array_multisort($sort1, SORT_ASC, $goodsList);
}
if($exclude_pdd==0){
- $newGoods =array_merge($newGoods,array_slice($ppdGoodes,0,$pagesize));
+ $goodsList =array_merge($goodsList,array_slice($ppdGoodes,0,$pagesize));
}
if($exclude_dy==0){
- $newGoods =array_merge($newGoods,array_slice($dyGoods,0,$pagesize));
+ $goodsList =array_merge($goodsList,array_slice($dyGoods,0,$pagesize));
}
}
//濡傛灉杩樻槸涓嶆弧瓒�20鍒欎粠娣樺疂鍟嗗搧閲岃ˉ瓒�20
- if(count($newGoods)<40){
+ if(count($goodsList)<40){
if($exclude_tb==0){
$tbGoods = $LogicDataoke->superSearch($title,1,20,0,0);
//鍘婚櫎閿�閲忎负0鐨勫晢鍝佸苟鎸夌収浠锋牸鎺掑簭
@@ -257,15 +257,16 @@
//鎸夌収浠锋牸鎺掑簭
$sort1 = array_column($tbGoods, 'actualPrice');
array_multisort($sort1, SORT_ASC, $tbGoods);
- $newGoods =array_merge($newGoods,array_slice($tbGoods,0,20));
+ $goodsList =array_merge($goodsList,array_slice($tbGoods,0,20));
}
}
-
+ //灏�$ogoods鎻掑叆鍒�$goodsList绗竴琛�
+ if(!empty($ogoods)){
+ array_unshift($goodsList,$ogoods);
+ }
//鍙栧嚭鍓�20涓晢鍝�
- $newGoods=array_merge($ogoods,$newGoods);
- $goodsList = array_slice($newGoods,0,40);
+ $goodsList = array_slice($goodsList,0,40);
return $goodsList;
-
}
--
Gitblit v1.9.3