|
|
@@ -655,12 +655,12 @@ class OrderController extends BaseController
|
|
|
$get = Yii::$app->request->get();
|
|
|
$id = isset($get['id']) ? $get['id'] : 0;
|
|
|
$order = OrderClass::getById($id, true);
|
|
|
- if(empty($order)){
|
|
|
- $msg ='没有找到订单';
|
|
|
+ if (empty($order)) {
|
|
|
+ $msg = '没有找到订单';
|
|
|
util::success(['returnStatus' => 'FAILURE'], $msg);
|
|
|
}
|
|
|
if ($order->status != 1) {
|
|
|
- $msg ='不是待付款订单';
|
|
|
+ $msg = '不是待付款订单';
|
|
|
util::success(['returnStatus' => 'FAILURE'], $msg);
|
|
|
}
|
|
|
OrderClass::valid($order, $this->shopId);
|
|
|
@@ -668,20 +668,20 @@ class OrderController extends BaseController
|
|
|
$cg = PurchaseClass::getById($cgId, true);
|
|
|
$orderSn = $cg->orderSn ?? '';
|
|
|
if (empty($orderSn)) {
|
|
|
- $msg ='没有找到采购单';
|
|
|
+ $msg = '没有找到采购单';
|
|
|
util::success(['returnStatus' => 'FAILURE'], $msg);
|
|
|
}
|
|
|
//付款码
|
|
|
$authCode = (string)$get['authCode'] ?? '';
|
|
|
if (empty($authCode)) {
|
|
|
- $msg ='没有付款码';
|
|
|
+ $msg = '没有付款码';
|
|
|
util::success(['returnStatus' => 'FAILURE'], $msg);
|
|
|
}
|
|
|
|
|
|
$deadline = $cg->deadline;
|
|
|
$current = date("Y-m-d H:i:s");
|
|
|
if ((strtotime($deadline) + 20) < strtotime($current)) {
|
|
|
- $msg ='订单已经失效';
|
|
|
+ $msg = '订单已经失效';
|
|
|
util::success(['returnStatus' => 'FAILURE'], $msg);
|
|
|
}
|
|
|
$totalFee = $cg->actPrice ?? 0;
|
|
|
@@ -778,8 +778,8 @@ class OrderController extends BaseController
|
|
|
util::success(['returnStatus' => 'SUCCESS']);
|
|
|
} else {
|
|
|
$msg = $response['msg'] ?? '';
|
|
|
- $retCode = $response['code']??'';
|
|
|
- noticeUtil::push($msg.' '.$retCode.' 编号145539', '15280215347');
|
|
|
+ $retCode = $response['code'] ?? '';
|
|
|
+ noticeUtil::push($msg . ' ' . $retCode . ' 编号145539', '15280215347');
|
|
|
util::success(['returnStatus' => 'FAILURE'], $msg);
|
|
|
}
|
|
|
} catch (\Exception $e) {
|
|
|
@@ -1039,7 +1039,7 @@ class OrderController extends BaseController
|
|
|
if (getenv('YII_ENV') == 'production') {
|
|
|
//小向花卉开单售后控制
|
|
|
if ($this->mainId == 23390) {
|
|
|
- if (!in_array($this->adminId, [24043, 24585, 24586, 24654, 24115, 23960, 28456, 31105, 28456, 31105,52528])) {
|
|
|
+ if (!in_array($this->adminId, [24043, 24585, 24586, 24654, 24115, 23960, 28456, 31105, 28456, 31105, 52528])) {
|
|
|
util::fail('你不能开单哦');
|
|
|
}
|
|
|
}
|
|
|
@@ -1063,6 +1063,15 @@ class OrderController extends BaseController
|
|
|
$transType = $post['transType'] ?? 0;
|
|
|
|
|
|
$shop = $this->shop;
|
|
|
+
|
|
|
+ //到期超过5天不支持开单
|
|
|
+ $deadline = $shop->deadline;
|
|
|
+ $deadTime = strtotime($deadline);
|
|
|
+ $myCurrentTime = time() + 432000;
|
|
|
+ if ($myCurrentTime > $deadTime) {
|
|
|
+ util::fail('系统已到期,请续费');
|
|
|
+ }
|
|
|
+
|
|
|
if (isset($shop->pfLevel) && $shop->pfLevel == 1) {
|
|
|
//昆明发往全国
|
|
|
$sendCost = isset($post['sendCost']) && $post['sendCost'] > 0 ? $post['sendCost'] : 0;
|
|
|
@@ -2329,7 +2338,7 @@ class OrderController extends BaseController
|
|
|
//超管或者约定的人可以修改日期
|
|
|
if (getenv('YII_ENV') == 'production') {
|
|
|
if (in_array($mainId, [23390])) {
|
|
|
- if (!in_array($this->adminId, [24586, 23960,24043])) {
|
|
|
+ if (!in_array($this->adminId, [24586, 23960, 24043])) {
|
|
|
util::fail('你不能修改哦');
|
|
|
}
|
|
|
}
|