From ff42a171ae5ef8e3143b42d6af33ffdf606a3a80 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 09:39:05 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.4开发' into develop
---
application/api/logic/taoke/device/Haodanku.php | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/application/api/logic/taoke/device/Haodanku.php b/application/api/logic/taoke/device/Haodanku.php
index 305db93..2da1d1e 100644
--- a/application/api/logic/taoke/device/Haodanku.php
+++ b/application/api/logic/taoke/device/Haodanku.php
@@ -918,19 +918,41 @@
'back' => $pageSize
];
$result = send_get(self::request_url['dy_onebuy_url'],$send_data);
- log::write($result);
if(empty($result) || $result['code'] != 200) fault('鏁版嵁鑾峰彇澶辫触');
$list = $result['data'];
-
+ $list_new=[];
+ $title_list=[];
if(!empty($list)){
foreach($list as &$goods){
+ $itemtitle=$goods['itemtitle'];
+ if(empty($title_list)){
+ array_push($title_list,$itemtitle);
+ }
+ else{
+ //鍒ゆ柇鍟嗗搧鏍囬鏄惁鐩镐技
+ $is_same=false;
+ foreach($title_list as &$title){
+ similar_text($title,$itemtitle,$percent);
+ log::write($title.'----------'.$itemtitle.'--------------'.$percent);
+ if($percent>60){
+ $is_same=true;
+ break;
+ }
+ }
+ if($is_same){
+ continue;
+ }
+ array_push($title_list,$itemtitle);
+ }
$goods['shoptype']='';
- $goods = self::initDyOneByGoods($goods);
+ // $goods = self::initDyOneByGoods($goods);
+ array_push($list_new,self::initDyOneByGoods($goods));
}
+
}
- return $list;
+ return $list_new;
}
@@ -1035,7 +1057,8 @@
$init_goods['isCollect'] = self::isCollect($init_goods);
$init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['dyrates']/100);
$init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['dyrates']/100,self::$topFanliRate);
-
+ //鏂板鍟嗗搧绫荤洰ID--byhyt
+ $init_goods['cid'] = isset($goods['cate_id']) ? $goods['cate_id'] : '';
return $init_goods;
}
@@ -1068,7 +1091,8 @@
$init_goods['isCollect'] = self::isCollect($init_goods);
$init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['dyrates']/100);
$init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['dyrates']/100,self::$topFanliRate);
-
+ //鏂板鍟嗗搧绫荤洰ID--byhyt
+ $init_goods['cid'] = isset($goods['cate_id']) ? $goods['cate_id'] : '';
return $init_goods;
}
@@ -1132,9 +1156,10 @@
$init_goods['faction'] = 'd';
$init_goods['labelImg'] = self::initSourse($init_goods['sourceType']);
$init_goods['isCollect'] = self::isCollect($init_goods);
- $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['dyrates']/100);
- $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['dyrates']/100,self::$topFanliRate);
-
+ $init_goods['fanli'] =isset($goods['itemendprice']) ? $goods['itemendprice'] : 0;
+ $init_goods['topFanli'] =0;
+ //鏂板鍟嗗搧绫荤洰ID--byhyt
+ $init_goods['cid'] = isset($goods['cate_id']) ? $goods['cate_id'] : '';
return $init_goods;
}
--
Gitblit v1.9.3