康养城VIP

app/admin/controller/order/WholeController.php

@@ -440,8 +440,12 @@ class WholeController extends Curd
         $order->sheet_amount = number_format($sheetAmount,2);
 
         $payDetail = PayDetail::where('join_pay_order_id', $order->order_groupby)
-            ->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount')
+            ->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount','pay_extend_json')
             ->first();
+        if(!empty($payDetail) && !empty($payDetail->pay_extend_json)){
+            $payExtendJson = json_decode($payDetail->pay_extend_json,true);
+            $payDetail->cancel_times = $payExtendJson['cancel_times'] ?? '';
+        }
         $refund = OrderReturn::where('join_return_order_id',$orderId)
             ->select('order_return_status','order_return_apply_datetime','order_return_apply_json','order_return_accept_datetime','order_return_refund_json','order_return_extend_json')
             ->first();
@@ -457,7 +461,7 @@ class WholeController extends Curd
         }
 
 
-        if (!empty($payDetail->pay_prepayid)) {
+        if (!empty($payDetail) && !empty($payDetail->pay_prepayid)) {
             $categoryArray = explode('-', $payDetail->pay_prepayid);
             if (isset($categoryArray[1])) {
                 $payDetail->pay_category = $categoryArray[1];

app/admin/service/order/OrderService.php

@@ -146,8 +146,7 @@ class OrderService
                     ]);
                 }
             }
-
-            echo date('Y-m-d H:i:s')."执行\n";
+            
             Db::commit();
         } catch (\Exception $e) {
             Db::rollBack();

app/event/order/KangyangCityEvent

@@ -0,0 +1,10 @@
+<?php
+
+namespace app\event\order;
+
+class KangyangCityEvent{
+    public function grant($params)
+    {
+        
+    }
+}