Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
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
chenchuanwen
my-yaf-project
Commits
08a5dbc4
Commit
08a5dbc4
authored
Oct 11, 2018
by
zhz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
store
parent
15dd1331
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
7 deletions
+2
-7
Store.php
application/controllers/Store.php
+2
-2
GoodsBrowse.php
application/models/DAO/GoodsBrowse.php
+0
-5
No files found.
application/controllers/Store.php
View file @
08a5dbc4
...
...
@@ -10,10 +10,10 @@ class StoreController extends \Our\Controller_AbstractIndex {
$this
->
memberId
=
$this
->
sess
->
get
(
'member_id'
);
}
/**
* 获取店铺首页头部
(公用)
* 获取店铺首页头部
*/
public
function
getStoreInfoAction
(){
$address
=
\Business\User\AddressServiceModel
::
getInstance
()
->
getMyAddress
(
$this
->
req
[
\Our\NameConst
::
data
],
$this
->
memberId
);
$address
=
\Business\User\AddressServiceModel
::
getInstance
()
->
getMyAddress
(
$this
->
req
[
\Our\NameConst
::
data
],
$this
->
memberId
,
false
);
$storeInfo
=
$this
->
storeService
->
getStoreInfo
(
$this
->
req
[
\Our\NameConst
::
data
],
$this
->
memberId
,
$address
);
$storeInfo
[
'share'
]
=
\Business\Common\CommonServiceModel
::
getInstance
()
->
getShareInfo
(
\Our\ApiConst
::
shareStore
,
$this
->
req
[
\Our\NameConst
::
data
][
'storeId'
]);
$this
->
success
(
$storeInfo
);
...
...
application/models/DAO/GoodsBrowse.php
View file @
08a5dbc4
...
...
@@ -91,11 +91,6 @@ class GoodsBrowseModel extends \DAO\AbstractModel {
public
function
getDistinctDate
(
$member_id
,
$startTime
,
$endTime
,
$order
){
$this
->
setDb
();
$data
=
$this
->
db
->
select
(
'DISTINCT browsedate'
)
->
from
(
$this
->
_tableName
)
->
where
(
"member_id=
{
$member_id
}
"
)
->
where
(
"browsedate BETWEEN
{
$startTime
}
AND
{
$endTime
}
"
)
->
order
(
$order
[
0
],
$order
[
1
])
->
fetchAll
();
if
(
$data
)
{
foreach
(
$data
as
&
$v
)
{
$v
[
'browsedate'
]
=
(
int
)
$v
[
'browsedate'
];
}
}
return
$data
;
}
public
function
delete
(
$where
){
...
...
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