diff --git a/app/common/model/order/Order.php b/app/common/model/order/Order.php index 4b5fbd04..9a929cc7 100755 --- a/app/common/model/order/Order.php +++ b/app/common/model/order/Order.php @@ -114,6 +114,7 @@ class Order extends Models OrderEnum::SECKILL_ORDER => '秒杀订单', OrderEnum::TEAM_ORDER => '拼团订单', OrderEnum::BARGAIN_ORDER => '砍价订单', + OrderEnum::GROUP_BUY=>'抢购订单', ]; if ($type === true) { @@ -303,7 +304,6 @@ class Order extends Models */ public function getCancelBtnAttr($value, $data) { - $btn = 0; if (is_string($data['create_time'])) { $data['create_time'] = strtotime($data['create_time']); @@ -314,9 +314,10 @@ class Order extends Models if ($limit_time < time()) { return $btn; } - if($data['pay_status'] == PayEnum::ISPAID && $data['order_type'] == OrderEnum::GROUP_BUY){ + if($data['pay_status'] == PayEnum::ISPAID && $data['order_type'] == '抢购订单'){ return $btn; } + if (($data['order_status'] == OrderEnum::ORDER_STATUS_NO_PAID && $data['pay_status'] == PayEnum::UNPAID) || ($data['pay_status'] == PayEnum::ISPAID && $data['order_status'] == OrderEnum::ORDER_STATUS_DELIVERY)) { $btn = 1;