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
4109360f
Commit
4109360f
authored
Sep 13, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz
parents
155e52fd
c7ad2a3c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
MemberFavoritesStoreStoreMemberStatistics.php
...s/DAO/Store/MemberFavoritesStoreStoreMemberStatistics.php
+1
-1
index.php
scripts/crontab/shopkeeper/index.php
+1
-1
No files found.
application/models/DAO/Store/MemberFavoritesStoreStoreMemberStatistics.php
100755 → 100644
View file @
4109360f
...
@@ -65,7 +65,7 @@ class MemberFavoritesStoreStoreMemberStatisticsModel extends \DAO\AbstractModel
...
@@ -65,7 +65,7 @@ class MemberFavoritesStoreStoreMemberStatisticsModel extends \DAO\AbstractModel
$this
->
setDb
(
$this
->
dbName
);
$this
->
setDb
(
$this
->
dbName
);
$whereStr
=
" store_id="
.
$storeId
;
$whereStr
=
" store_id="
.
$storeId
;
if
(
!
empty
(
$keyword
)){
if
(
!
empty
(
$keyword
)){
$whereStr
.=
Common
::
format
(
" and(member_name
='
{
0
}
' or member_mobile='
{
1
}
') "
,
$keyword
);
$whereStr
.=
Common
::
format
(
" and(member_name
like '%
{
0
}
%' or member_mobile like '%
{
0
}
%
') "
,
$keyword
);
}
}
$result
=
$this
->
lists
(
$whereStr
,
$sort
,
$this
->
field
,
$pageIndex
,
$pageSize
);
$result
=
$this
->
lists
(
$whereStr
,
$sort
,
$this
->
field
,
$pageIndex
,
$pageSize
);
if
(
!
empty
(
$result
[
'list'
])){
if
(
!
empty
(
$result
[
'list'
])){
...
...
scripts/crontab/shopkeeper/index.php
100755 → 100644
View file @
4109360f
...
@@ -71,7 +71,7 @@ class cliShopkeeperIndex extends basecli
...
@@ -71,7 +71,7 @@ class cliShopkeeperIndex extends basecli
$shopkeeperService
->
baseDir
=
\Our\Common
::
getConfig
(
'out.config'
);
$shopkeeperService
->
baseDir
=
\Our\Common
::
getConfig
(
'out.config'
);
try
{
try
{
$shopkeeperService
->
insertStoreMemberStatics
();
$shopkeeperService
->
insertStoreMemberStatics
();
$shopkeeperService
->
reduceStoreMemberStatics
();
//
$shopkeeperService->reduceStoreMemberStatics();
$shopkeeperService
->
storeStatictisTask
();
$shopkeeperService
->
storeStatictisTask
();
$shopkeeperService
->
updateLastId
();
$shopkeeperService
->
updateLastId
();
}
catch
(
Exception
$ex
)
{
}
catch
(
Exception
$ex
)
{
...
...
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