预约、订单、核销日志

app/admin/controller/member/BenefitController.php

@@ -169,10 +169,12 @@ class BenefitController extends Curd
 
             Db::commit();
 
+            _syslog("核销","核销成功");
             return json_success('核销成功');
         } catch (\Exception $e) {
             dump($e->getMessage());
             Db::rollBack();
+            _syslog("核销","核销失败");
             return json_fail('核销失败');
         }
     }
@@ -230,10 +232,12 @@ class BenefitController extends Curd
 
             Db::commit();
 
+            _syslog("核销","核销成功");
             return json_success('核销成功');
         } catch (\Exception $e) {
             dump($e->getFile().'---'.$e->getLine());
             Db::rollBack();
+            _syslog("核销","核销失败");
 
             throw new BusinessException('核销失败');
         }

app/admin/controller/member/QuotaController.php

@@ -312,13 +312,15 @@ class QuotaController extends Curd
                 }
             }
             
+            _syslog("核销","核销成功");
 
+            return json_success("核销成功");
         } catch (\Exception $e) {
             dump($e->getMessage());
+            _syslog("核销","核销失败");
+
             return json_fail("核销失败");
         }
-
-        return json_success("核销成功");
     }
 
     public static function doWriteOff($params){
@@ -350,12 +352,16 @@ class QuotaController extends Curd
                 ]);
             }
 
+            _syslog("核销","核销成功");
+            return json_success("核销成功");
+
         } catch (\Exception $e) {
+            _syslog("核销","核销失败");
+            
             throw new BusinessException('核销失败');
             // return json_fail("核销失败");
         }
 
-        return json_success("核销成功");
     }
 
 }

app/admin/controller/order/WholeController.php

@@ -77,6 +77,9 @@ class WholeController extends Curd
             unset($where['order_is_complete']);
             $where['order_category'] = 'RETURN';
         }
+        if ($request->get('return')){
+            $where['order_return.order_return_status'] = $request->get('return');
+        }
 
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
@@ -85,7 +88,7 @@ class WholeController extends Curd
     protected function doSelect(array $where, string $field = null, string $order = 'desc')
     {
         $model = $this->model->with([
-            'sheet' => function ($query) {
+            'sheets' => function ($query) {
                 $query->select('join_sheet_order_id', 'order_sheet_id', 'join_sheet_goods_id', 'order_sheet_num');
             },
             'member' => function ($query) {
@@ -94,13 +97,17 @@ class WholeController extends Curd
             'cert' => function ($query) {
                 $query->select('join_cert_member_id', 'member_cert_name');
             },
-            'return' => function ($query) {
-                $query->select('orders_return_id', 'join_return_order_id', 'order_return_status');
-            },
+//            'return' => function ($query) use ($where){
+//                if (isset($where['return'])){
+//                    dump($where['return']);
+//                    $query = $query->where('order_return_status',$where['return']);
+//                }
+//                $query->select('orders_return_id', 'join_return_order_id', 'order_return_status');
+//            },
             'express' => function ($query) {
                 $query->select('join_express_order_id', 'order_express_type');
             }
-        ]);
+        ])->leftJoin('order_return','order_return.join_return_order_id','=','order.order_id');
         foreach ($where as $column => $value) {
             if (is_array($value)) {
                 if ($value[0] === 'like' || $value[0] === 'not like') {
@@ -133,18 +140,32 @@ class WholeController extends Curd
         if ($field) {
             $model = $model->orderBy($field, $order);
         }
+        $model = $model->select('order.*','order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status');
         return $model;
     }
 
     public function afterQuery($items)
     {
         foreach ($items as &$item) {
+            $sheetDeng = '';
+            if(isset($item['sheets'][1])){
+                $sheetDeng = ' 等餐品';
+            }
+            $item['sheet'] = $item['sheets'][0] ?? [];
             if (!empty($item['sheet'])) {
                 $goods = Goods::where('goods_id', $item['sheet']['join_sheet_goods_id'])->first();
-                $item['sheet']['goods_name'] = $goods->goods_name ?? '';
+                $item['sheet']['goods_name'] = ($goods && $goods->goods_name) ? $goods->goods_name.$sheetDeng : '';
                 $item['sheet']['goods_classify'] = $goods->goods_classify ?? '';
                 $item['sheet']['order_sheet_num'] = intval($item['sheet']['order_sheet_num']);
             }
+            unset($item['sheets']);
+            if (isset($item['orders_return_id'])){
+                $item['return'] = [
+                    'orders_return_id'=>$item['orders_return_id'],
+                    'join_return_order_id' => $item['join_return_order_id'],
+                    'order_return_status' => $item['order_return_status']
+                ];
+            }
         }
 
         return $items;
@@ -356,10 +377,11 @@ class WholeController extends Curd
             $this->updateExpress($params);
 
             Db::commit();
-
+            _syslog("订单","修改订单成功");
             return json_success('修改订单成功');
         } catch (\Exception $e) {
             Db::rollBack();
+            _syslog("订单","修改订单失败");
             return json_fail('修改订单失败');
         }
     }
@@ -447,11 +469,13 @@ class WholeController extends Curd
 
             Db::commit();
 
+            _syslog("订单","删除订单成功");
             return json_success('删除订单成功');
         } catch (\Exception $e) {
             dump($e->getMessage());
             Db::rollBack();
 
+            _syslog("订单","删除订单失败");
             return json_fail('删除订单失败');
         }
     }
@@ -607,10 +631,12 @@ class WholeController extends Curd
 
             Db::commit();
 
+            _syslog("订单","创建订单成功");
             return json_success('创建订单成功');
         } catch (\Exception $e) {
             Db::rollBack();
             dump($e->getMessage());
+            _syslog("订单","创建订单失败");
             return json_fail('创建订单失败');
         }
     }
@@ -919,10 +945,12 @@ class WholeController extends Curd
 
             Db::commit();
 
+            _syslog("订单","发货成功");
             return json_success('发货成功');
         } catch (\Exception $e) {
             Db::rollBack();
             dump($e->getMessage());
+            _syslog("订单","发货失败");
             return json_fail('发货失败');
         }
     }
@@ -999,10 +1027,12 @@ class WholeController extends Curd
 
             Db::commit();
 
+            _syslog("订单","核销成功");
             return json_success('核销成功');
         } catch (\Exception $e) {
             dump($e->getMessage());
             Db::rollBack();
+            _syslog("订单","核销失败");
             return json_fail('核销失败');
         }
     }
@@ -1048,10 +1078,12 @@ class WholeController extends Curd
 
             Db::commit();
 
+            _syslog("订单","核销餐品成功");
             return json_success('核销成功');
         } catch (\Exception $e) {
             dump($e->getMessage());
             Db::rollBack();
+            _syslog("订单","核销餐品失败");
             return json_fail('核销失败');
         }
     }
@@ -1138,21 +1170,21 @@ class WholeController extends Curd
     }
 
     // TODO 确认收货（完成订单）
-    public function confirm($id)
-    {
-        $order = Order::where('order_id', $id)->first();
-        if (empty($order)) {
-            return json_fail("暂无数据");
-        }
-
-        Db::beginTransaction();
-        try {
-            // 主订单
-            Order::where('order_id', $id)->update(['order_status_system' => 'CONFIRM']);
-        } catch (\Exception $e) {
-
-        }
-    }
+//    public function confirm($id)
+//    {
+//        $order = Order::where('order_id', $id)->first();
+//        if (empty($order)) {
+//            return json_fail("暂无数据");
+//        }
+//
+//        Db::beginTransaction();
+//        try {
+//            // 主订单
+//            Order::where('order_id', $id)->update(['order_status_system' => 'CONFIRM']);
+//        } catch (\Exception $e) {
+//
+//        }
+//    }
 
     /**
      * @Desc 退款
@@ -1386,6 +1418,8 @@ class WholeController extends Curd
         }
 
         $query = $this->doSelect($where, $field, $order);
+
+        _syslog("订单","导出订单");
         return $this->exportDoFormat($query, $format, 1000);
     }
 

app/admin/service/auth/AuthService.php

@@ -49,7 +49,7 @@ class AuthService
             // 提交事务
             DB::commit();
             // 写操作日志
-            _syslog("登录", "管理员【" . $params['username'] . "】登录系统; ID：" . $user->user_id, false, false, $user->user_id);
+            _syslog("登录", "管理员【" . $params['username'] . "】登录系统; ID：" . $user->user_id, false, ['username'=>$params['username']], $user->user_id);
 
             return json_success('', $token);
         } catch (\Exception $e) {

app/admin/service/order/AppointmentService.php

@@ -327,14 +327,17 @@ class AppointmentService
             }
 
             Db::commit();
+            _syslog("预约","添加预约成功");
             return json_success("添加预约成功");
         }catch (BusinessException $e){
             Db::rollBack();
 
+            _syslog("预约","添加预约失败");
             return json_fail($e->getMessage());
         } catch (\Exception $e) {
             Db::rollBack();
             dump($e->getMessage());
+            _syslog("预约","添加预约失败");
             return json_fail("添加预约失败");
         }
     }
@@ -597,18 +600,23 @@ class AppointmentService
                 if(empty($appointment->join_appointment_member_benefit_id)){
                     Appointment::where('appointment_id', $appointmentId)->update(['join_appointment_member_benefit_id' => $params['quota_id']]);
                 }
+
+                _syslog("预约","已有服务核销");
             }
 
 
             Db::commit();
+            _syslog("预约","预约数据更新成功");
             return json_success("数据更新成功");
         }catch(\support\exception\BusinessException $e){
             Db::rollBack();
             dump($e->getFile().'--'.$e->getLine());
+            _syslog("预约","预约数据更新失败");
             return json_fail($e->getMessage());
         } catch (\Exception $e) {
             Db::rollBack();
             dump($e->getFile().'--'.$e->getLine());
+            _syslog("预约","预约数据更新失败");
             return json_fail("数据更新失败");
         }
     }

app/model/Order.php

@@ -33,6 +33,11 @@ class Order extends Model
         return $this->hasOne(OrderSheet::class, 'join_sheet_order_id', 'order_id');
     }
 
+    public function sheets()
+    {
+        return $this->hasMany(OrderSheet::class, 'join_sheet_order_id', 'order_id');
+    }
+
     public function member()
     {
         return $this->hasOne(Member::class, 'member_id', 'join_order_member_id');

support/helpers.php

@@ -642,7 +642,7 @@ function _syslog($name, $operation, $operationData = false, $requestParams = fal
     $model = new \app\model\SysLog();
     $model->log_admin_id = $logAdminId;
     $model->log_name = $name;
-    $model->log_route = \request()->route->getPath();
+    $model->log_route = \request()->uri() ?? \request()->route->getPath();
     $model->log_operation = $operation;
     $model->log_ip = \request()->getRealIp();
     $model->log_request_params = $requestParams ? json_encode($requestParams) : json_encode(\request()->all());