ccw:master_dev

application/models/Business/Order/OrderService.php

@@ -122,6 +122,7 @@ class OrderServiceModel extends \Business\AbstractModel
             if ($orderState != false) {
                 if($orderState==ApiConst::orderStateComplete){
                     $where['evaluation_state']=ApiConst::waitEvaluation;
+                    $where['order_state']=array('eq',ApiConst::orderStateComplete);
                 }
                 if($orderState==ApiConst::orderStateWaitRecieveOne){
                     $where['shipping_type']=array('eq',ApiConst::bySeller);
@@ -240,6 +241,9 @@ class OrderServiceModel extends \Business\AbstractModel
         $goodsDao = \DAO\GoodsModel::getInstance(DbNameConst::salveDBConnectName);
         //订单
         $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond,array($orderId));
+        if(!$order){
+            ErrorModel::throwException(CodeConfigModel::orderNotExist);
+        }
         $fields = $orderDao->getFields();
         $this->order = $orderDao->getConvertOrder($order, $fields);
         //收货人地址
@@ -272,6 +276,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $returnData['shippingName'] = $orderDao->getShippingName($returnData['shippingType']);
         $returnData['orderMessage'] = $this->orderCommon['orderMessage'];
         $returnData['shippingFeeName'] = $orderDao->getFreightFeeName($returnData['shippingType']);
+        $returnData['dlyoPickupCode'] = intval(substr($returnData['orderSn'], ApiConst::positionPickupCodeBegin));
         $returnData['paymentName'] = $orderDao->getPayTypeName($returnData['paymentType']);
         $returnData['discountAmount'] = $returnData['goodsAmount'] - $returnData['orderAmount'] + $returnData['shippingFee'];
         $returnData['orderText'] = $orderDao->getStatusDetailText($this->order);