From 2ca3644d7bc09271a253014a8cd199dae73470ca Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 19 六月 2023 11:57:50 +0800
Subject: [PATCH] Merge branch 'hotfix/618修复' into feature/1.1.3api开发
---
application/api/controller/Taoke.php | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index f038fff..3f64396 100644
--- a/application/api/controller/Taoke.php
+++ b/application/api/controller/Taoke.php
@@ -319,7 +319,14 @@
case 4: //鎶栭煶
$LogicHaodanku = new LogicHaodanku();
$info = $LogicHaodanku->idPrivilege($goods_id,$common_relation_id);
- $info['dy_deeplink'] = $info['dy_zlink'];
+ if(!empty($info['dy_zlink']))
+ {
+ $info['dy_deeplink'] = $info['dy_zlink'];
+ }
+ else{
+ $info['dy_zlink']=$info['detail_url'];
+ }
+
break;
}
@@ -338,9 +345,13 @@
if(empty($goods_id)) $this->error('鍟嗗搧id涓嶈兘涓虹┖');
- $LogicHaodanku = new LogicHaodanku();
+ // $LogicHaodanku = new LogicHaodanku();
- $list = $LogicHaodanku->getSimilarInfo($goods_id,10);
+ // $list = $LogicHaodanku->getSimilarInfo($goods_id,10);
+
+ $LogicDataoke=new LogicDataoke();
+ $list=$LogicDataoke->getSimilarInfo($goods_id,10);
+
if($list === false) $this->error($LogicHaodanku->getError());
@@ -1070,16 +1081,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(!$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]);
+
}
@@ -1101,10 +1117,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());
@@ -1187,7 +1204,13 @@
$info = "";
}else{
$resLink = $LogicHaodanku->idPrivilege($res['goods_id'],$common_relation_id);
- $info = empty($resLink) ? "" : $resLink['dy_zlink'];
+ if(empty($resLink))
+ {
+ $info ="";
+ }
+ else{
+ $info = empty($resLink['dy_zlink']) ? $resLink['dy_deeplink'] : $resLink['dy_zlink'];
+ }
}
break;
}
@@ -1327,4 +1350,27 @@
$this->success('鑾峰彇鎴愬姛',['list' => $list]);
}
+ /**
+ * 0鍏冭喘鍟嗗搧鍒楄〃锛堣皟鐢�9.9鍖呴偖绮鹃�夋帴鍙ｏ紝鑾峰彇3.9鍏冨晢鍝侊級
+ *
+ * @return void
+ */
+ public function get_first_free_goods(){
+
+ $page = request()->param('page',1);
+ $page_size = request()->param('pageSize',40);
+ $LogicDataoke = new LogicDataoke();
+
+ $list = $LogicDataoke->getOpGoodsList(1,$page,$page_size);
+
+ 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]);
+ }
+
}
--
Gitblit v1.9.3