核销、发货人

app/admin/controller/order/WholeController.php

@@ -493,7 +493,7 @@ class WholeController extends Curd
                     $query->whereJsonContains('join_pay_object_json->order_id', $orderId)->orWhere('join_pay_object_json', '')->orWhereNull('join_pay_object_json');
                 })->where('pay_category', '<>', 'REFUND')
                 ->where('pay_status', 'SUCCESS')
-                ->where('pay_prepayid','<>','')
+                ->where('pay_prepayid', '<>', '')
                 ->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount', 'pay_extend_json')
                 ->get();
             if (count($payDetails) > 1) {
@@ -3226,7 +3226,7 @@ class WholeController extends Curd
                 'order_express_json' => $params['order_express_json'] ?? '[]',
                 'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
                 'order_addtimes' => time(),
-                'order_add_user_id'=>JwtToken::getCurrentId()
+                'order_add_user_id' => JwtToken::getCurrentId()
             ];
 
             Order::insert($data);
@@ -3716,6 +3716,8 @@ class WholeController extends Curd
             }
 
             // 该订单状态
+            $orderData['order_update_user_id'] = JwtToken::getCurrentId();
+            $orderData['order_updatetimes'] = time();
             Order::where('order_id', $request->post('order_id'))->update($orderData);
             // 该订单Sheet状态
             OrderSheet::where('join_sheet_order_id', $request->post('order_id'))->update($orderSheetData);
@@ -4110,6 +4112,12 @@ class WholeController extends Curd
                         Event::dispatch('order.write_off', $params);
                     }
                 }
+
+                // 写核销人
+                Order::where('order_id', $benefit['join_benefit_order_id'])->update([
+                    'order_update_user_id' => JwtToken::getCurrentId(),
+                    'order_updatetimes' => time()
+                ]);
             }
 
 //            Redis::del($key);
@@ -4120,7 +4128,7 @@ class WholeController extends Curd
             return json_success('核销成功');
         } catch (\Exception $e) {
             unset($appointmentIds);
-            dump($e->getMessage() . $e->getLine());
+            Log::error('核销失败', ['msg' => $e->getMessage()]);
             Db::rollBack();
             _syslog("订单", "核销失败");
             return json_fail('核销失败');
@@ -5284,7 +5292,7 @@ class WholeController extends Curd
                     $this->insertMemberBenefit($params, $goods);
                 }
 
-                $this->sendCoupon($params, ['goods_id'=>$params['packageId']], $params['orderId']);
+                $this->sendCoupon($params, ['goods_id' => $params['packageId']], $params['orderId']);
             }
         } catch (\Exception $e) {
             _syslog("下单", '权益设置失败');
@@ -5307,6 +5315,7 @@ class WholeController extends Curd
         }
 
     }
+
     public function deductAccount($orderId, $orderGroup, $payWay)
     {
         $payDetails = PayDetail::where('join_pay_order_id', $orderGroup)