订单查询

app/admin/controller/order/WholeController.php

@@ -450,7 +450,8 @@ class WholeController extends Curd
         $payDetail = !empty($payDetails) && count($payDetails) > 0 ? $payDetails[0] : [];
         if (!empty($payDetail) && !empty($payDetail->pay_extend_json)) {
             $payExtendJson = json_decode($payDetail->pay_extend_json, true);
-            $payDetail->cancel_times = $payExtendJson['cancel_times'] ?? '';
+            $order->cancel_times = $payExtendJson['cancel_times'] ?? '';
+//            $payDetail->cancel_times = $payExtendJson['cancel_times'] ?? '';
         }
         if (!empty($payDetail) && !empty($payDetail->pay_prepayid)) {
             $categoryArray = explode('-', $payDetail->pay_prepayid);
@@ -497,6 +498,9 @@ class WholeController extends Curd
         if (!empty($order->order_extend_json)) {
             $orderExtendJson = json_decode($order->order_extend_json, true);
             $order->referee = $orderExtendJson['referee'] ?? '';
+            if (isset($orderExtendJson['cancel_times'])){
+                $order->cancel_times = $orderExtendJson['cancel_times'];
+            }
         }
         $discount = ['coupon_name' => '', 'classify' => '', 'value' => 0];
         if (!empty($order->order_discount_json)) {
@@ -504,13 +508,13 @@ class WholeController extends Curd
             foreach ($orderDiscountJson as $discountItem) {
                 if (!empty($discountItem['coupon_id'])) {
                     $coupon = Coupon::where('coupon_id', $discountItem['coupon_id'])
-                        ->select('coupon_name','coupon_classify','coupon_category','coupon_value','coupon_minimum_limit')
+                        ->select('coupon_name', 'coupon_classify', 'coupon_category', 'coupon_value', 'coupon_minimum_limit')
                         ->first();
-                    if (!$coupon){
+                    if (!$coupon) {
                         continue;
                     }
-                    $classify = CouponService::couponClassifyInfo($coupon->coupon_classify,$coupon->coupon_category,$coupon->coupon_value,$coupon->coupon_minimum_limit);
-                    $discount['coupon_name'] .=  $coupon->coupon_classify.'：'.$coupon->coupon_name.'(优惠￥'.$discountItem['coupon_value']. '), ';
+                    $classify = CouponService::couponClassifyInfo($coupon->coupon_classify, $coupon->coupon_category, $coupon->coupon_value, $coupon->coupon_minimum_limit);
+                    $discount['coupon_name'] .= $coupon->coupon_classify . '：' . $coupon->coupon_name . '(优惠￥' . $discountItem['coupon_value'] . '), ';
                 }
                 if (empty($discountItem['coupon_id']) && !empty($discountItem['coupon_classify'])) {
                     $discount['classify'] .= $discountItem['coupon_classify'] . '(￥' . round($discountItem['coupon_value'], 2) . '), ';
@@ -1713,6 +1717,13 @@ class WholeController extends Curd
                     SysDept::where('dept_id', $orderConfigJson['tableid'])->update(['dept_status' => 'ACTIVED']);
                 }
             }
+            // 主表存取消时间吧
+            $orderExtendJson = [];
+            if (!empty($order->order_extend_json)) {
+                $orderExtendJson = json_decode($order->order_extend_json, true);
+            }
+            $orderExtendJson['cancel_times'] = date('Y-m-d H:i:s');
+            $order->order_extend_json = json_encode($orderExtendJson, JSON_UNESCAPED_UNICODE);
 
             $order->order_is_complete = 'Y';
             $order->order_status_system = 'CANCEL';