diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index c900863d..5a430e3b 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -643,6 +643,8 @@ class StoreOrderRepository extends BaseRepository $order->presell_price = $order->pay_price; } } + + // 状态处理 $order->order_status = 0; if ($order->paid == 0) { $order->order_status = 1; @@ -662,6 +664,9 @@ class StoreOrderRepository extends BaseRepository if ($order->status == -1) { $order->order_status = 6; } + if ($order->paid == 1 && $order->status == 0 && $order->order_type == 1) { + $order->order_status = 7; + } return $order; } @@ -1766,7 +1771,8 @@ class StoreOrderRepository extends BaseRepository } } $order->takeOrderCount = count($order['takeOrderList']); - // 订单状态 1 未支付 2待发货 3待收货 4待评价 5交易完成 6已退款 + + // 订单状态 1 未支付 2待发货 3待收货 4待评价 5交易完成 6已退款 7待核销 8已支付 $order->order_status = 0; if ($order->paid == 0) { $order->order_status = 1; @@ -1786,6 +1792,9 @@ class StoreOrderRepository extends BaseRepository if ($order->status == -1) { $order->order_status = 6; } + if ($order->paid == 1 && $order->status == 0 && $order->order_type == 1) { + $order->order_status = 7; + } unset($order['takeOrderList'], $order->interest); }