diff --git a/app/repository/OrderRepository.php b/app/repository/OrderRepository.php index 065ba18..d6c9c51 100755 --- a/app/repository/OrderRepository.php +++ b/app/repository/OrderRepository.php @@ -941,7 +941,7 @@ class OrderRepository extends Repository } $this->update([ - 'status' => self::STATUS_COMPLETED, + 'status' => self::STATUS_ARRIVED, 'commission_give' => Order::COMMON_ON, 'accepted_at' => $nowDateTime ], ['id' => $orderId]); @@ -1027,7 +1027,6 @@ class OrderRepository extends Repository case self::STATUS_MAKEING: case self::STATUS_SHIPPED: case self::STATUS_ARRIVED: - case self::STATUS_COMPLETED: case self::STATUS_CANCEL: $status = [$tag]; break; @@ -1035,7 +1034,7 @@ class OrderRepository extends Repository /* case 'waiting_comment': $where[] = ['is_evaluate', '=', self::IS_EVALUATE_YES]; - $status = [self::STATUS_COMPLETED]; + $status = [self::STATUS_ARRIVED]; break; */ // 待核验 @@ -1044,13 +1043,13 @@ class OrderRepository extends Repository $where[] = ['has_virtual', '=', Order::COMMON_ON]; $where[] = ['virtual_check', '=', Order::COMMON_OFF]; $where[] = ['frontend_check', '=', Order::COMMON_OFF]; - $status = [self::STATUS_PAID, self::STATUS_COMPLETED, self::STATUS_SHIPPED]; + $status = [self::STATUS_PAID, self::STATUS_ARRIVED, self::STATUS_SHIPPED]; break; */ // 售后记录 /* case 'after_sale': - $status = [self::STATUS_PAID, self::STATUS_SHIPPED, self::STATUS_COMPLETED]; + $status = [self::STATUS_PAID, self::STATUS_SHIPPED, self::STATUS_ARRIVED]; $where[] = ['is_after_sale', '=', self::BOOL_TRUE]; break; */ @@ -1060,7 +1059,6 @@ class OrderRepository extends Repository self::STATUS_MAKEING , self::STATUS_SHIPPED , self::STATUS_ARRIVED , - self::STATUS_COMPLETED , self::STATUS_CANCEL , ]; } @@ -1164,7 +1162,7 @@ class OrderRepository extends Repository $expressInfo = []; if (!empty($order['express_code']) && !empty($order['express_number'])) { try { - if ($order['status'] == self::STATUS_COMPLETED) { + if ($order['status'] == self::STATUS_ARRIVED) { $exprLog = $this->findExpressLogByNu($order['coding'], $order['express_code'], $order['express_number']); if (!empty($exprLog)) { $expressInfo['status'] = 200;