Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/models/Business/Order/OrderService.php

@@ -107,10 +107,14 @@ class OrderServiceModel extends \Business\AbstractModel
             $where = $this->getOrderIndexWhere($memberId, $keyWord, $pageIndex, $pageSize);
         } else {
             $where['delete_state'] = ApiConst::undeleteOrder;
+
             $where['buyer_id'] = $memberId;
             //$where['lock_state'] = ApiConst::zero;
 
             if ($orderState != false) {
+                if($orderState==ApiConst::orderStateComplete){
+                    $where['evaluation_state']=ApiConst::waitEvaluation;
+                }
                 $where['order_state'] = array('in', explode(',', $orderState));
             }
         }

application/models/DAO/Order/Order.php

@@ -573,7 +573,7 @@ class OrderModel extends \DAO\AbstractModel
         }
         $diff = TIMESTAMP - $order['finnshedTime'];
         if ($order['orderState'] == ApiConst::orderStateComplete && $diff < ApiConst::oneDaySecond) {
-            $refundStateName == '退货';
+            $refundStateName == DescribeConst::refundRetund;
         }
         return $refundStateName;