预约，订单状态调整

app/admin/service/order/AppointmentService.php

@@ -41,6 +41,7 @@ class AppointmentService
             ->leftJoin('member_info', 'member_info.join_info_member_id', '=', 'appointment.join_appointment_member_id')
             ->leftJoin('goods', 'goods.goods_id', '=', 'appointment.join_appointment_goods_id')
             ->leftJoin('order', 'order.order_id', '=', 'appointment.join_appointment_order_id')
+            ->leftJoin('order_return', 'order_return.join_return_order_id', '=', 'appointment.join_appointment_order_id')
             ->leftJoin('member_benefit', 'member_benefit.member_benefit_id', '=', 'appointment.join_appointment_member_benefit_id')
             ->leftJoin('goods_sku', 'goods_sku.goods_sku_id', '=', 'appointment.join_appointment_goods_sku_id')
             ->whereIn('appointment_status',['PAYING','WAITING','PENDING','DOING','DONE','CANCEL','REVOKE'])
@@ -70,8 +71,8 @@ class AppointmentService
             'member_info.member_info_nickname',
             'goods.goods_name', 'goods.goods_cover', 'goods.goods_sales_price',
             'order.order_id','order.order_name', 'goods_sku.goods_sku_specs_json', 'order.order_amount_total', 'order.order_amount_pay',
-            'order.order_category', 'order.order_status_system', 'order.order_status_payment', 'order.order_status_storage',
-            'order.order_addtimes',
+            'order.order_category', 'order.order_status_system', 'order.order_status_payment', 'order.order_status_storage','order.order_is_complete',
+            'order.order_addtimes','order_return.order_return_status',
             'member_benefit.member_benefit_name','member_benefit.member_benefit_id as benefit_id'
         )
             ->orderBy('appointment.appointment_addtimes', 'desc')

app/functions.php

@@ -23,6 +23,7 @@
         return $output;
     }
 }
+
 if (!function_exists('http_post_json')) {
     function http_post_json($url,$params){
         $ch = curl_init();

support/helpers.php

@@ -624,31 +624,6 @@ function chinese_week($week)
     return '周' . $weekArray[$week];
 }
 
-/**
- * @Desc 管理员操作日志
- * @Author Gorden
- * @Date 2024/3/29 17:07
- * 
- * adminId = 1001 充值
- *
- * @param $name
- * @param $operation
- * @return void
- */
-function _syslog($name, $operation, $operationData = false, $requestParams = false, $adminId = false)
-{
-    $logAdminId = $adminId ? $adminId : \Tinywan\Jwt\JwtToken::getCurrentId();
-    $model = new \app\model\SysLog();
-    $model->log_admin_id = $logAdminId;
-    $model->log_name = $name;
-    $model->log_route = \request()->route->getPath();
-    $model->log_operation = $operation;
-    $model->log_ip = \request()->getRealIp();
-    $model->log_request_params = $requestParams ? json_encode($requestParams) : json_encode(\request()->all());
-    $model->log_operation_data = $operationData ? json_encode($operationData) : null;
-    $model->save();
-}
-
 
 /**
  * @Desc 颜色值转RGB

support/helpers_now.php

@@ -624,31 +624,6 @@ function chinese_week($week)
     return '周' . $weekArray[$week];
 }
 
-/**
- * @Desc 管理员操作日志
- * @Author Gorden
- * @Date 2024/3/29 17:07
- * 
- * adminId = 1001 充值
- *
- * @param $name
- * @param $operation
- * @return void
- */
-function _syslog($name, $operation, $operationData = false, $requestParams = false, $adminId = false)
-{
-    $logAdminId = $adminId ? $adminId : \Tinywan\Jwt\JwtToken::getCurrentId();
-    $model = new \app\model\SysLog();
-    $model->log_admin_id = $logAdminId;
-    $model->log_name = $name;
-    $model->log_route = \request()->route->getPath();
-    $model->log_operation = $operation;
-    $model->log_ip = \request()->getRealIp();
-    $model->log_request_params = $requestParams ? json_encode($requestParams) : json_encode(\request()->all());
-    $model->log_operation_data = $operationData ? json_encode($operationData) : null;
-    $model->save();
-}
-
 
 /**
  * @Desc 颜色值转RGB