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
9d29eac2
Commit
9d29eac2
authored
Oct 23, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw
parents
eac52abd
9c006c41
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
StoreService.php
application/models/Business/Store/StoreService.php
+4
-4
No files found.
application/models/Business/Store/StoreService.php
View file @
9d29eac2
...
...
@@ -41,9 +41,9 @@ class StoreServiceModel extends \Business\AbstractModel{
list
(
$storeInfo
,
$storeLabel
)
=
\DAO\StoreModel
::
getInstance
()
->
get
(
$storeId
);
if
((
int
)
$param
[
'isScan'
]
>
0
)
{
//扫码进入
\Our\Log
::
getInstance
()
->
write
(
$param
[
'isScan'
]
.
' '
.
$memberId
,
'special'
);
\Our\Log
::
getInstance
()
->
write
(
$param
[
'isScan'
]
.
' '
.
$memberId
,
'
/data/log/
special'
);
if
(
$memberId
>
0
)
{
\Our\Log
::
getInstance
()
->
write
(
'会员'
,
'special'
);
\Our\Log
::
getInstance
()
->
write
(
'会员'
,
'
/data/log/
special'
);
if
(
$param
[
'sid'
])
{
$sale
=
\DAO\SaleModel
::
getInstance
()
->
getOne
(
array
(
'sale_id'
=>
$param
[
'sid'
]),
'sale_act_id,member_id'
);
if
(
$sale
)
{
...
...
@@ -60,12 +60,12 @@ class StoreServiceModel extends \Business\AbstractModel{
$favoritesStoreDao
=
\DAO\FavoritesStoreModel
::
getInstance
();
$result
=
$favoritesStoreDao
->
insertAll
(
$storeMembers
);
}
else
{
\Our\Log
::
getInstance
()
->
write
(
'无会员'
,
'special'
);
\Our\Log
::
getInstance
()
->
write
(
'无会员'
,
'
/data/log/
special'
);
$sess
=
\Yaf\Session
::
getInstance
();
$scan_store_ids
=
$sess
->
get
(
'scan_store_ids'
);
is_array
(
$scan_store_ids
)
?
$scan_store_ids
=
$scan_store_ids
:
$scan_store_ids
=
[];
array_push
(
$scan_store_ids
,
$storeId
);
\Our\Log
::
getInstance
()
->
write
(
serialize
(
array_unique
(
$scan_store_ids
)),
'special'
);
\Our\Log
::
getInstance
()
->
write
(
serialize
(
array_unique
(
$scan_store_ids
)),
'
/data/log/
special'
);
$sess
[
'scan_store_ids'
]
=
array_unique
(
$scan_store_ids
);
if
(
$param
[
'sid'
])
{
$scan_sale_ids
=
$sess
->
get
(
'scan_sale_ids'
);
...
...
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