|
|
@@ -18,8 +18,8 @@ class OrderController extends Controller
|
|
|
{
|
|
|
$query = new \yii\db\Query();
|
|
|
$query->from(\bizGhs\order\models\Order::tableName());
|
|
|
- $endTime = strtotime('-5 days');
|
|
|
- //$endTime = strtotime('-1 hour');
|
|
|
+ //$endTime = strtotime('-5 days');
|
|
|
+ $endTime = strtotime('-1 hour');
|
|
|
$startTime = strtotime('-30 days');
|
|
|
$startDate = date("Y-m-d H:i:s", $startTime);
|
|
|
$endDate = date("Y-m-d H:i:s", $endTime);
|
|
|
@@ -35,7 +35,7 @@ class OrderController extends Controller
|
|
|
$cgId = $order['purchaseId'] ?? 0;
|
|
|
$info = PurchaseClass::getById($cgId, true);
|
|
|
if (!empty($info)) {
|
|
|
- //预订单不能自动确认收货
|
|
|
+ //没发货的预订单不能自动确认收货
|
|
|
if ($info->book == 1) {
|
|
|
continue;
|
|
|
}
|
|
|
@@ -57,8 +57,8 @@ class OrderController extends Controller
|
|
|
{
|
|
|
$query = new \yii\db\Query();
|
|
|
$query->from(Purchase::tableName());
|
|
|
- $endTime = strtotime('-5 days');
|
|
|
- //$endTime = strtotime('-1 hour');
|
|
|
+ //$endTime = strtotime('-5 days');
|
|
|
+ $endTime = strtotime('-1 hour');
|
|
|
$startTime = strtotime('-30 days');
|
|
|
$startDate = date("Y-m-d H:i:s", $startTime);
|
|
|
$endDate = date("Y-m-d H:i:s", $endTime);
|