|
|
@@ -106,6 +106,13 @@ class OrderController extends BaseController
|
|
|
if ($order->status != OrderClass::ORDER_STATUS_UN_PAY && $order->status != OrderClass::ORDER_STATUS_CANCEL) {
|
|
|
util::success(['returnStatus' => 'SUCCESS']);
|
|
|
}
|
|
|
+ $deadline = $order->deadline ?? '';
|
|
|
+ $deadTime = strtotime($deadline);
|
|
|
+ $current = time();
|
|
|
+ $diff = bcsub($deadTime, $current);
|
|
|
+ if($diff <= 60){
|
|
|
+ util::success(['returnStatus' => 'EXPIRE']);
|
|
|
+ }
|
|
|
util::success(['returnStatus' => 'FAILURE']);
|
|
|
}
|
|
|
|
|
|
@@ -135,7 +142,7 @@ class OrderController extends BaseController
|
|
|
$totalFee = $cg->actPrice ?? 0;
|
|
|
|
|
|
$outTradeNo = $orderSn;
|
|
|
- $subject = '购买商品';
|
|
|
+ $subject = '购买鲜花';
|
|
|
$totalAmount = $totalFee;
|
|
|
$body = "到店订单";
|
|
|
|