浏览代码

Merge branch 'develop'

master
Guillaume 4 年前
父节点
当前提交
9127bade42
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. +3
    -2
      ShopBundle/Model/OrderShop.php

+ 3
- 2
ShopBundle/Model/OrderShop.php 查看文件

@@ -2,13 +2,14 @@

namespace Lc\ShopBundle\Model;

use App\Entity\OrderStatus;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Gedmo\Mapping\Annotation as Gedmo;
use Doctrine\ORM\Mapping as ORM;
use Lc\ShopBundle\Context\DocumentInterface;
use Lc\ShopBundle\Context\FilterMerchantInterface;
use Lc\ShopBundle\Services\Order\OrderUtils;
use Lc\ShopBundle\Model\OrderStatus ;

/**
* @ORM\MappedSuperclass()
@@ -157,7 +158,7 @@ abstract class OrderShop extends AbstractEntity implements FilterMerchantInterfa

public function getDateCreated()
{
$orderStatusHistory = $this->getOrderStatusHistory('new');
$orderStatusHistory = $this->getOrderStatusHistory(OrderStatus::ALIAS_WAITING_DELIVERY);
if ($orderStatusHistory) {
return $orderStatusHistory->getCreatedAt();
}

正在加载...
取消
保存