Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
1f9a4321
Commit
1f9a4321
authored
Jul 17, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
61588225
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
Shop.php
application/api_broker/controller/Shop.php
+6
-1
GHouses.php
application/model/GHouses.php
+0
-1
UpdateShopStatusTask.php
application/task/controller/UpdateShopStatusTask.php
+1
-1
No files found.
application/api_broker/controller/Shop.php
View file @
1f9a4321
...
@@ -48,7 +48,11 @@ class Shop extends Basic
...
@@ -48,7 +48,11 @@ class Shop extends Basic
public
function
getShopList
()
public
function
getShopList
()
{
{
header
(
'Access-Control-Allow-Origin:*'
);
header
(
'Access-Control-Allow-Origin:*'
);
$params
=
$this
->
params
;
$params
=
$this
->
params
;
$params
=
array
(
"site_area"
=>
4
,
//来源 1c首页 2c搜索 3b首页 4b搜索 5b报备
);
/*$params = array(
/*$params = array(
"site_area" => 4, //来源 1c首页 2c搜索 3b首页 4b搜索 5b报备
"site_area" => 4, //来源 1c首页 2c搜索 3b首页 4b搜索 5b报备
// "title" => "vv", //1,2 external_title ,3,4internal_title
// "title" => "vv", //1,2 external_title ,3,4internal_title
...
@@ -174,7 +178,7 @@ class Shop extends Basic
...
@@ -174,7 +178,7 @@ class Shop extends Basic
}
}
}
}
}
}
$order_
=
"id desc"
;
$order_
=
"
status asc,
id desc"
;
break
;
break
;
default
:
default
:
return
$this
->
response
(
"101"
,
"请求数据异常"
);
return
$this
->
response
(
"101"
,
"请求数据异常"
);
...
@@ -193,6 +197,7 @@ class Shop extends Basic
...
@@ -193,6 +197,7 @@ class Shop extends Basic
$conditions
[
'status'
]
=
!
empty
(
$params
[
'status'
])
?
$params
[
'status'
]
:
array
(
'in'
,
"1,2"
);
//只显示上架或下架的
$conditions
[
'status'
]
=
!
empty
(
$params
[
'status'
])
?
$params
[
'status'
]
:
array
(
'in'
,
"1,2"
);
//只显示上架或下架的
}
}
$result
=
$this
->
gHousesModel
->
getHousesList
(
$pageNo
,
$pageSize
,
$order_
,
$field
,
$conditions
,
$spTagArr
);
$result
=
$this
->
gHousesModel
->
getHousesList
(
$pageNo
,
$pageSize
,
$order_
,
$field
,
$conditions
,
$spTagArr
);
//获取图片信息
//获取图片信息
foreach
(
$result
as
$key
=>
$val
)
{
foreach
(
$result
as
$key
=>
$val
)
{
$result
[
$key
][
"api_path"
]
=
CK_IMG_URL
.
'images/'
;
$result
[
$key
][
"api_path"
]
=
CK_IMG_URL
.
'images/'
;
...
...
application/model/GHouses.php
View file @
1f9a4321
...
@@ -844,7 +844,6 @@ class GHouses extends BaseModel
...
@@ -844,7 +844,6 @@ class GHouses extends BaseModel
->
where
(
$where_
)
->
where
(
$where_
)
->
group
(
"a.id "
)
->
group
(
"a.id "
)
->
select
();
->
select
();
//echo Db::table($this->table)->getLastSql();
return
$result
;
return
$result
;
}
}
...
...
application/task/controller/UpdateShopStatusTask.php
View file @
1f9a4321
...
@@ -46,7 +46,7 @@ class UpdateShopStatusTask
...
@@ -46,7 +46,7 @@ class UpdateShopStatusTask
}
else
{
}
else
{
return
null
;
return
null
;
}
}
echo
$day
;
$field
=
"a.id,b.id as order_id"
;
$field
=
"a.id,b.id as order_id"
;
$params
=
[];
$params
=
[];
$time_
=
date
(
'Y-m-d'
,
strtotime
(
"-
$day
day"
));
$time_
=
date
(
'Y-m-d'
,
strtotime
(
"-
$day
day"
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment