From 5405b2d58041464e1b44cbdebd941a7d605782d3 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 06 七月 2023 09:35:21 +0800
Subject: [PATCH] no message
---
application/api/controller/Taoke.php | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index ade73fd..2402e86 100644
--- a/application/api/controller/Taoke.php
+++ b/application/api/controller/Taoke.php
@@ -678,12 +678,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]);
@@ -1361,14 +1373,19 @@
$page_size = request()->param('pageSize',100);
$LogicDataoke = new LogicDataoke();
- $list = $LogicDataoke->getOpGoodsList(1,$page,$page_size,['6','7']);
+ $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);
+ $list= array_slice($list, 0, 40);
$this->success('鑾峰彇鎴愬姛',['list'=>$list]);
}
@@ -1381,20 +1398,13 @@
public function get_first_free_dy_goods(){
$page = request()->param('page',1);
- $page_size = request()->param('pageSize',50);
+ $page_size = request()->param('pageSize',40);
$LogicHaodanku = new LogicHaodanku();
$list = $LogicHaodanku->getDyOnebyGood($page,$page_size);
+
if($list === false) $this->error($LogicHaodanku->getError());
-
- foreach($list as $key => $value){
- if($list[$key]['actualPrice']>4){
- unset($list[$key]);
- }
- }
- // $list= array_slice($list, 0, 40);
-
$this->success('鑾峰彇鎴愬姛',['list'=>$list]);
}
--
Gitblit v1.9.3