Commit eaaaf1a1 authored by wwccw0591's avatar wwccw0591

pc

parent 246a4d3a
...@@ -213,6 +213,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -213,6 +213,7 @@ class OrderServiceModel extends \Business\AbstractModel
*/ */
public function getOrderDetail($orderId) public function getOrderDetail($orderId)
{ {
error_reporting(E_ALL);
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName); $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
$addressDao = \DAO\AddressModel::getInstance(DbNameConst::salveDBConnectName); $addressDao = \DAO\AddressModel::getInstance(DbNameConst::salveDBConnectName);
$orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName); $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
...@@ -260,13 +261,14 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -260,13 +261,14 @@ class OrderServiceModel extends \Business\AbstractModel
$returnData['shippingTime'] = $this->orderCommon['shippingTime']; $returnData['shippingTime'] = $this->orderCommon['shippingTime'];
if ($returnData['diliverymanId']) { if ($returnData['diliverymanId']) {
$returnData['deliveryman'] = $diliverymanDao->convert($this->diliveryman, $this->getDeliveryManFields()); $returnData['deliveryman'] = $diliverymanDao->convert($this->diliveryman, $this->getDeliveryManFields());
if(empty($returnData['deliveryman']['qrcodePath'])){
$returnData['deliveryman']['qrcodePath']='';
}
} else { } else {
$returnData['diliverymanId'] = ApiConst::zero; $returnData['diliverymanId'] = ApiConst::zero;
$returnData['deliveryman'] = new \stdClass(); $returnData['deliveryman'] = new \stdClass();
} }
if(empty($returnData['deliveryman']['qrcodePath'])){
$returnData['deliveryman']['qrcodePath']='';
}
$returnData['totalGoodsNum'] = $orderGoodsDao->getGoodsCount($this->orderGoodsList); $returnData['totalGoodsNum'] = $orderGoodsDao->getGoodsCount($this->orderGoodsList);
$returnData['offlinePayway'] = $this->store['offlinePayway'] ? $this->store['offlinePayway'] : ''; $returnData['offlinePayway'] = $this->store['offlinePayway'] ? $this->store['offlinePayway'] : '';
$returnData['reciverInfo'] = $this->address; $returnData['reciverInfo'] = $this->address;
......
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