From 8c00bd0245ca4756ca04483a4980ad202714e43e Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 09:40:44 +0800
Subject: [PATCH] Merge branch 'release/v1.1.4发布'
---
application/api/controller/Taoke.php | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 225 insertions(+), 14 deletions(-)
diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index 651714d..a47c9b4 100644
--- a/application/api/controller/Taoke.php
+++ b/application/api/controller/Taoke.php
@@ -323,6 +323,9 @@
{
$info['dy_deeplink'] = $info['dy_zlink'];
}
+ else{
+ $info['dy_zlink']=$info['detail_url'];
+ }
break;
}
@@ -395,8 +398,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());
@@ -675,12 +679,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]);
@@ -707,7 +723,7 @@
$this->success('鑾峰彇鎴愬姛',['list'=>$list]);
}
-
+
/**
* 杈ｅ浼橀��
*/
@@ -1078,16 +1094,21 @@
public function identify_goods()
{
$goods_url = request()->param('goods_url','', 'urldecode');
-
- log::write('鏅鸿兘鎼滅储鍐呭'.$goods_url);
if (empty($goods_url)) $this->error('閾炬帴涓嶈兘涓虹┖');
$LogicSearch = new LogicSearch();
$info = $LogicSearch->ast($goods_url);
+ if(!empty($info)&&!$info["goodsId"]&&$info["title"]){
+ $this->success('鑾峰彇鎴愬姛',['goods_url'=>$info["title"],'goods'=>[]]);
+
+ }
+ else{
+ $this->success('鑾峰彇鎴愬姛',['goods_url'=>$goods_url,'goods'=>$info]);
+ }
- $this->success('鑾峰彇鎴愬姛',['goods_url'=>$goods_url,'goods'=>$info]);
+
}
@@ -1109,10 +1130,11 @@
$sort = request()->param('sort',0);
$tchaoshi=request()->param('tchaoshi',0);
-
+ //浜岀骇绛涢��
+ $secrend_search=request()->param('secrend_search',0);
$LogicDataoke = new LogicDataoke();
- $list = $LogicDataoke->getGoodsList($cateId,$subcid,$sort,$page,$page_size,$tchaoshi);
+ $list = $LogicDataoke->getGoodsList($cateId,$subcid,$sort,$page,$page_size,$tchaoshi,$secrend_search);
if($list === false) $this->error($LogicDataoke->getError());
@@ -1349,18 +1371,207 @@
public function get_first_free_goods(){
$page = request()->param('page',1);
- $page_size = request()->param('pageSize',50);
+ $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);
$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 = [];
+ if($page<3&&!empty($cids)){
+ switch($platefrom){
+ case 'tb': //娣樺疂鑱旂洘
+ $LogicDataoke = new LogicDataoke();
+ $list = $LogicDataoke->getGoodsList($cids,'',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);
+ }
+ 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);
+ }
+ 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;
+ }
+ }
+ 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;
+ }
+ }
+ $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