Browse Source

fixed:提取方法:处理余额支付

刘学玺 4 months ago
parent
commit
5282cac67c
1 changed files with 4 additions and 4 deletions
  1. 4 4
      app/Services/Client/OrderService.php

+ 4 - 4
app/Services/Client/OrderService.php

@@ -214,7 +214,7 @@ class OrderService
     private function getOriginalOrder($user, $orderId): Order
     {
         $originalOrder = $user->orders->where('id', $orderId)
-            ->whereIn('state', ['service_ing', 'service_end'])
+            ->whereIn('state', [OrderStatus::SERVING->value, OrderStatus::FINISHED->value])
             ->firstOrFail();
 
         return $originalOrder;
@@ -223,7 +223,7 @@ class OrderService
     // 提取方法:准备加钟订单数据
     private function prepareAddTimeData($originalOrder, $data): array
     {
-        if ($originalOrder->state == 'service_ing') {
+        if ($originalOrder->state == OrderStatus::SERVING->value) {
             $startTime = now();
         } else {
             $startTime = now();
@@ -289,14 +289,14 @@ class OrderService
     // 提取方法:处理余额支付
     private function handleBalancePayment($user, $order, $orderType): void
     {
-        $order->state = $orderType == 'normal' ? 'wait_receive' : 'service_ing';
+        $order->state = $orderType == OrderType::VISIT->value || $orderType == OrderType::GRAB->value ? OrderStatus::PAID->value : OrderStatus::SERVING->value;
         $order->save();
 
         OrderRecord::create([
             'order_id' => $order->id,
             'object_id' => $user->id,
             'object_type' => MemberUser::class,
-            'state' => 'pay',
+            'state' => OrderRecordStatus::PAID->value,
             'remark' => '余额支付',
         ]);