diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 0c526f3..dd14ff3 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -280,7 +280,7 @@ class StoreOrderRepository extends BaseRepository } if ($order->order_type == 1 && $order->status != 10) $order->verify_code = $this->verifyCode(); if (!in_array($order->activity_type,[30,31,32,33]) && $order->orderProduct[0]->product->type == 2) { - $order->status = 2; + $order->status = 3;//2; todo 订单进入待评价改为已完成 $order->delivery_type = 6; $order->delivery_name = '自动发货'; $order->delivery_id = $this->sendCdkey($order); @@ -877,7 +877,7 @@ class StoreOrderRepository extends BaseRepository // throw new ValidateException('用户不存在'); // } //订单状态(0:待发货;1:待收货;2:待评价;3:已完成; 9: 拼团中 10: 待付尾款 11:尾款超时未付 -1:已退款) - $order->status = $order->activity_type == 20 ? 3 : 2; + $order->status = 3;//2; todo 订单进入待评价改为已完成 $order->activity_type == 20 ? 3 : 2; $order->verify_time = date('Y-m-d H:i:s'); event('order.take.before', compact('order')); //订单记录 @@ -1421,7 +1421,7 @@ class StoreOrderRepository extends BaseRepository case 3: $change_type = $statusRepository::ORDER_DELIVERY_NOTHING; $change_message = '订单已配送【虚拟发货】'; - $data['status'] = 2; + $data['status'] = 3;//2; todo 订单进入待评价改为已完成 break; case 4: $exprss = app()->make(ExpressRepository::class)->getWhere(['code' => $data['delivery_name']]); @@ -1468,7 +1468,7 @@ class StoreOrderRepository extends BaseRepository event('order.delivery', compact('order', 'data')); - if($data['status'] == 2) event('order.take', compact('order')); + if($data['status'] == 2 || $data['status'] == 3) event('order.take', compact('order')); return $data; } @@ -2018,7 +2018,7 @@ class StoreOrderRepository extends BaseRepository } $spl = app()->make(StoreOrderSplitRepository::class)->splitOrder($order, $splitData, $serviceId, 1); if ($spl) $order = $spl; - $order->status = 2; + $order->status = 3;//2; todo 订单进入待评价改为已完成 $order->verify_time = date('Y-m-d H:i:s'); $order->verify_service_id = $serviceId; event('order.verify.before', compact('order'));