Skip to content

M
my-yaf-project
Commit 03356c7e authored by christ's avatar christ
Browse files
Options

share

parent 439d4408
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
application/models/Business/Order/OrderService.php
View file @ 03356c7e
...@@ -124,10 +124,10 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -124,10 +124,10 @@ class OrderServiceModel extends \Business\AbstractModel
if($orderState==ApiConst::orderStateComplete){ if($orderState==ApiConst::orderStateComplete){
$where['evaluation_state']=ApiConst::waitEvaluation; $where['evaluation_state']=ApiConst::waitEvaluation;
$where['order_state']=array('eq',ApiConst::orderStateComplete); $where['order_state']=array('eq',ApiConst::orderStateComplete);
}elseif($orderState==ApiConst::orderStateWaitRecieveOne){ }elseif($orderState==ApiConst::orderStateWaitRecieveOne || $orderState==ApiConst::orderStateWaitRecieve){
$where['shipping_type']=array('eq',ApiConst::bySeller); $where['shipping_type']=array('eq',ApiConst::bySeller);
$where['order_state'] =array('in',array(ApiConst::orderStateWaitSend,ApiConst::orderStateWaitRecieve)); $where['order_state'] =array('in',array(ApiConst::orderStateWaitSend,ApiConst::orderStateWaitRecieve));
}elseif($orderState==ApiConst::orderStateWaitSendOne || $orderState==ApiConst::orderStateWaitRecieve){ }elseif($orderState==ApiConst::orderStateWaitSendOne){
$where['shipping_type']=array('eq',ApiConst::bySelf); $where['shipping_type']=array('eq',ApiConst::bySelf);
$where['order_state']=array('eq',ApiConst::orderStateWaitRecieve); $where['order_state']=array('eq',ApiConst::orderStateWaitRecieve);
}else{ }else{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment