From d01dbe195c5dc2886ce4bf62d66d7459cefda667 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 13 七月 2023 11:36:39 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.4开发' of http://60.204.153.149:8081/r/dfgApi into feature/v1.1.4开发
---
application/api/logic/taoke/device/Dataoke.php | 2
application/api/logic/taoke/device/Pdd.php | 3
application/api/controller/User.php | 18 ++++
application/api/logic/taoke/device/Jd.php | 41 ++++++++++
application/api/controller/Taoke.php | 123 ++++++++++++++++++++++++++++++
5 files changed, 185 insertions(+), 2 deletions(-)
diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index 2402e86..af4b2d3 100644
--- a/application/api/controller/Taoke.php
+++ b/application/api/controller/Taoke.php
@@ -1427,4 +1427,127 @@
$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,5,0,$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);
+ }
+ //濡傛灉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]);
+ }
+
}
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 9bd1e0d..a50f2e1 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -20,6 +20,8 @@
use app\api\logic\UserMoneyLog as LogicUserMoneyLog;
use think\log;
use app\api\logic\ActivityInfo as InfoActivityInfo;
+use app\common\model\UserExtend as ModelUserExtend;
+use think\Db;
/**
* 浼氬憳鎺ュ彛
@@ -1050,4 +1052,20 @@
$this->success('鑾峰彇鎴愬姛',$user);
}
+ /**
+ * 妫�娴嬫槸鍚︽湁鍋忓ソ鍟嗗搧
+ *
+ * @return void
+ */
+
+ public function check_preference_goods()
+ {
+ //鑾峰彇褰撳墠鐧诲綍浜虹敤鎴蜂俊鎭�
+ $user = $this->auth->getUser();
+ $ModelUserExtend=new ModelUserExtend();
+ $preference_goods=$ModelUserExtend->where(['id'=>$user['id']])->field('p_cids,p_platefrom')->find();
+ if(empty($preference_goods)||empty($preference_goods['p_cids'])) $this->error('鏆傛棤鍋忓ソ鍟嗗搧');
+ $this->success('鑾峰彇鎴愬姛',$preference_goods);
+ }
+
}
diff --git a/application/api/logic/taoke/device/Dataoke.php b/application/api/logic/taoke/device/Dataoke.php
index 6968925..fdf9694 100644
--- a/application/api/logic/taoke/device/Dataoke.php
+++ b/application/api/logic/taoke/device/Dataoke.php
@@ -38,7 +38,7 @@
'similer_url'=>'https://openapi.dataoke.com/api/goods/list-similer-goods-by-open',
'gift_money_url'=>'https://openapi.dataoke.com/api/goods/first-order-gift-money',
'bottom_price_url'=>'https://openapi.dataoke.com/api/goods/get-history-low-price-list',
- 'jdnines_url'=>'https://openapi.dataoke.com/api/dels/jd/column/list-nines',
+ 'jdnines_url'=>'https://openapi.dataoke.com/api/dels/jd/column/list-nines'
];
const shop_type = ["0"=>"娣樺疂","1"=>"澶╃尗","2"=>"澶╃尗瓒呭競","3"=>"澶╃尗鍥介檯"];
diff --git a/application/api/logic/taoke/device/Jd.php b/application/api/logic/taoke/device/Jd.php
index bec6224..1bac172 100644
--- a/application/api/logic/taoke/device/Jd.php
+++ b/application/api/logic/taoke/device/Jd.php
@@ -299,6 +299,47 @@
'pageSize' => $pageSize,
'keyword' => $keyword
];
+
+ if($isCoupon == 1)$send_data['isCoupon'] = $isCoupon;
+ $result = send_get(self::request_url['search_url'],$send_data);
+ if(empty($result) || $result['return'] != 0) return [];
+ $list = $result['result']['goods'];
+ if(!empty($list)){
+ foreach($list as &$goods){
+ $goods = self::initSearchGoods($goods);
+ }
+ }
+ return $list;
+ }
+
+ /**
+ * 鎼滅储鍟嗗搧锛堝鍔犵被鐩甶d--hyt锛� http://jingtuitui.com/api_item?id=3
+ *
+ * @param [type] $keyword 鍏抽敭璇�
+ * @param [type] $sort asc=鍗囬檷搴忥紱desc=榛樿闄嶅簭
+ * @param [type] $owner 鍟嗗搧绫诲瀷 锛氾紙g:鑷惀锛沺:POP锛�
+ * @param [type] $isCoupon 鏄惁鏄紭鎯犲埜鍟嗗搧 1=鏈変紭鎯犲埜
+ * @param [type] $sortName 鎺掑簭瀛楁 price鍗曚环锛� commissionShare浣ｉ噾姣斾緥锛� commission浣ｉ噾锛沬nOrderCount30Days 30澶╁紩鍗曢噺锛沬nOrderComm30Days 30澶╂敮鍑轰剑閲�
+ * @param [type] $page
+ * @param [type] $pageSize
+ * @param [type] $cid1 绫荤洰id
+ * @return void
+ */
+ public function search_cid_Goods($keyword,$sort,$owner,$isCoupon,$sortName,$page,$pageSize,$cid1)
+ {
+ $send_data = [
+ 'appkey' => $this->appkey,
+ 'appid' => $this->appid,
+ 'v' => $this->search_version,
+ 'sort' => $sort,
+ 'owner' => $owner,
+ 'sortName' => $sortName,
+ 'pageIndex' => $page,
+ 'pageSize' => $pageSize,
+ 'keyword' => $keyword,
+ 'cid1' => $cid1
+ ];
+
if($isCoupon == 1)$send_data['isCoupon'] = $isCoupon;
$result = send_get(self::request_url['search_url'],$send_data);
if(empty($result) || $result['return'] != 0) return [];
diff --git a/application/api/logic/taoke/device/Pdd.php b/application/api/logic/taoke/device/Pdd.php
index b7439e8..2db5a56 100644
--- a/application/api/logic/taoke/device/Pdd.php
+++ b/application/api/logic/taoke/device/Pdd.php
@@ -330,7 +330,7 @@
* @param mixed $sort_type 鎺掑簭鏂瑰紡:0-缁煎悎鎺掑簭;1-鎸変剑閲戞瘮鐜囧崌搴�;2-鎸変剑閲戞瘮渚嬮檷搴�;3-鎸変环鏍煎崌搴�;4-鎸変环鏍奸檷搴�;5-鎸夐攢閲忓崌搴�;6-鎸夐攢閲忛檷搴�;7-浼樻儬鍒搁噾棰濇帓搴忓崌搴�;8-浼樻儬鍒搁噾棰濇帓搴忛檷搴�;9-鍒稿悗浠峰崌搴忔帓搴�;10-鍒稿悗浠烽檷搴忔帓搴�;11-鎸夌収鍔犲叆澶氬杩涘疂鏃堕棿鍗囧簭;12-鎸夌収鍔犲叆澶氬杩涘疂鏃堕棿闄嶅簭;13-鎸変剑閲戦噾棰濆崌搴忔帓搴�;14-鎸変剑閲戦噾棰濋檷搴忔帓搴�;15-搴楅摵鎻忚堪璇勫垎鍗囧簭;16-搴楅摵鎻忚堪璇勫垎闄嶅簭;17-搴楅摵鐗╂祦璇勫垎鍗囧簭;18-搴楅摵鐗╂祦璇勫垎闄嶅簭;19-搴楅摵鏈嶅姟璇勫垎鍗囧簭;20-搴楅摵鏈嶅姟璇勫垎闄嶅簭;27-鎻忚堪璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣斿崌搴忥紝28-鎻忚堪璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣旈檷搴忥紝29-鐗╂祦璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣斿崌搴忥紝30-鐗╂祦璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣旈檷搴忥紝31-鏈嶅姟璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣斿崌搴忥紝32-鏈嶅姟璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣旈檷搴�
* @return void
*/
- public function searchGoods($keyword='',$opt_id='',$common_relation_id,$with_coupon = '',$page,$pageSize,$sort_type = 0)
+ public function searchGoods($keyword='',$opt_id='',$common_relation_id,$with_coupon = '',$page,$pageSize,$sort_type = 0,$cat_id='')
{
$params = [
'keyword' => $keyword,
@@ -340,6 +340,7 @@
'with_coupon' => empty($with_coupon) ? '' : ($with_coupon == 1 ? "true" : "false"),
'page' => $page,
'sort_type' => $sort_type,
+ 'cat_id' => $cat_id
];
if(!empty(MOBILE_INFO)){
--
Gitblit v1.9.3