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
fc5cbf0f
Commit
fc5cbf0f
authored
Nov 22, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clientOrder
parent
f1fa4c29
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+1
-0
Store.php
application/models/DAO/Store.php
+3
-3
No files found.
application/models/Business/Store/ShopkeeperService.php
View file @
fc5cbf0f
...
@@ -465,6 +465,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
...
@@ -465,6 +465,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
if
(
$count
){
if
(
$count
){
$data
[
'is_receive_payment'
]
=
TIMESTAMP
;
$data
[
'is_receive_payment'
]
=
TIMESTAMP
;
$updateId
=
$orderDao
->
updateByOrderId
(
$data
,
$orderId
);
$updateId
=
$orderDao
->
updateByOrderId
(
$data
,
$orderId
);
$orderDao
->
deleteOrderCache
(
$memberId
,
false
,
$storeId
);
return
$updateId
;
return
$updateId
;
}
else
{
}
else
{
ErrorModel
::
throwException
(
CodeConfigModel
::
notExsitOrder
);
ErrorModel
::
throwException
(
CodeConfigModel
::
notExsitOrder
);
...
...
application/models/DAO/Store.php
View file @
fc5cbf0f
...
@@ -41,10 +41,10 @@ class StoreModel extends \DAO\AbstractModel
...
@@ -41,10 +41,10 @@ class StoreModel extends \DAO\AbstractModel
if
(
!
empty
(
$offlinPayway
))
{
if
(
!
empty
(
$offlinPayway
))
{
$offlinPayway
=
unserialize
(
$offlinPayway
);
$offlinPayway
=
unserialize
(
$offlinPayway
);
$res
[
'images'
]
=
[];
$res
[
'image
Url
s'
]
=
[];
foreach
(
$offlinPayway
[
'images'
]
as
$image
){
foreach
(
$offlinPayway
[
'image
Url
s'
]
as
$image
){
$image
=
\Our\Common
::
getStaticFile
(
$image
,
\Our\ImageConst
::
storeLabel
);
$image
=
\Our\Common
::
getStaticFile
(
$image
,
\Our\ImageConst
::
storeLabel
);
array_push
(
$res
[
'images'
],
$image
);
array_push
(
$res
[
'image
Url
s'
],
$image
);
}
}
$res
[
'payway'
]
=
$offlinPayway
[
'payway'
]
?
$offlinPayway
[
'payway'
]
:
''
;
$res
[
'payway'
]
=
$offlinPayway
[
'payway'
]
?
$offlinPayway
[
'payway'
]
:
''
;
...
...
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