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
71978bcc
Commit
71978bcc
authored
Nov 12, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
order
parent
a97ee348
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
OrderService.php
application/models/Business/Order/OrderService.php
+4
-5
No files found.
application/models/Business/Order/OrderService.php
View file @
71978bcc
...
...
@@ -123,16 +123,15 @@ class OrderServiceModel extends \Business\AbstractModel
if
(
$orderState
==
ApiConst
::
orderStateComplete
){
$where
[
'evaluation_state'
]
=
ApiConst
::
waitEvaluation
;
$where
[
'order_state'
]
=
array
(
'eq'
,
ApiConst
::
orderStateComplete
);
}
if
(
$orderState
==
ApiConst
::
orderStateWaitRecieveOne
){
}
elseif
(
$orderState
==
ApiConst
::
orderStateWaitRecieveOne
){
$where
[
'shipping_type'
]
=
array
(
'eq'
,
ApiConst
::
bySeller
);
$where
[
'order_state'
]
=
array
(
'in'
,
array
(
ApiConst
::
orderStateWaitSend
,
ApiConst
::
orderStateWaitRecieve
));
}
if
(
$orderState
==
ApiConst
::
orderStateWaitSendOne
){
}
elseif
(
$orderState
==
ApiConst
::
orderStateWaitSendOne
){
$where
[
'shipping_type'
]
=
array
(
'eq'
,
ApiConst
::
bySelf
);
$where
[
'order_state'
]
=
array
(
'eq'
,
ApiConst
::
orderStateWaitRecieve
);
}
else
{
$where
[
'order_state'
]
=
array
(
'eq'
,
$orderState
);
}
// $where['order_state'] = array('in', explode(',', $orderState));
}
}
...
...
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