From f50e9e2ef14ac444361490bdceeba00d28d5e275 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Wed, 23 Feb 2022 10:51:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E6=A0=BC=E5=88=97?= =?UTF-8?q?=E8=A1=A8+=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/form/Order.php | 2 +- .../default/public/module/form_table.html | 2 +- app/index/form/Order.php | 2 +- .../default/public/module/form_table.html | 2 +- app/module/FormHandleModule.php | 5 ++-- app/service/OrderService.php | 23 ++++++++++--------- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/admin/form/Order.php b/app/admin/form/Order.php index 98e22ea64..62a1d79a8 100644 --- a/app/admin/form/Order.php +++ b/app/admin/form/Order.php @@ -281,7 +281,7 @@ class Order 'view_key' => 'user_note', 'is_sort' => 1, 'search_config' => [ - 'form_type' => 'select', + 'form_type' => 'input', 'where_type' => 'like', ], ], diff --git a/app/admin/view/default/public/module/form_table.html b/app/admin/view/default/public/module/form_table.html index 149febcfe..8b98938b6 100644 --- a/app/admin/view/default/public/module/form_table.html +++ b/app/admin/view/default/public/module/form_table.html @@ -225,7 +225,7 @@ {{/case}} {{case module}} - {{:ModuleInclude($t['view_key'], $data_list[$i], [ + {{:ModuleInclude(empty($t['template']) ? $t['view_key'] : $t['template'], $data_list[$i], [ 'form' => $t, 'params' => isset($form_params) ? $form_params : [], ])}} diff --git a/app/index/form/Order.php b/app/index/form/Order.php index b2db9e153..70ba076db 100644 --- a/app/index/form/Order.php +++ b/app/index/form/Order.php @@ -271,7 +271,7 @@ class Order 'view_key' => 'user_note', 'is_sort' => 1, 'search_config' => [ - 'form_type' => 'select', + 'form_type' => 'input', 'where_type' => 'like', ], ], diff --git a/app/index/view/default/public/module/form_table.html b/app/index/view/default/public/module/form_table.html index 149febcfe..8b98938b6 100644 --- a/app/index/view/default/public/module/form_table.html +++ b/app/index/view/default/public/module/form_table.html @@ -225,7 +225,7 @@ {{/case}} {{case module}} - {{:ModuleInclude($t['view_key'], $data_list[$i], [ + {{:ModuleInclude(empty($t['template']) ? $t['view_key'] : $t['template'], $data_list[$i], [ 'form' => $t, 'params' => isset($form_params) ? $form_params : [], ])}} diff --git a/app/module/FormHandleModule.php b/app/module/FormHandleModule.php index 61b5e476c..2f0bca5ce 100644 --- a/app/module/FormHandleModule.php +++ b/app/module/FormHandleModule.php @@ -410,9 +410,10 @@ class FormHandleModule // 是否指定了数据/表单唯一key作为条件、则复制当前key数据 // 用于根据key指定条件（指定不宜使用这里拼接的key） - if(array_key_exists($form_name, $this->out_params) && $this->out_params[$form_name] !== null && $this->out_params[$form_name] !== '') + $params_where_name = empty($v['params_where_name']) ? $form_name : $v['params_where_name']; + if(array_key_exists($params_where_name, $this->out_params) && $this->out_params[$params_where_name] !== null && $this->out_params[$params_where_name] !== '') { - $this->out_params[$form_key] = $this->out_params[$form_name]; + $this->out_params[$form_key] = $this->out_params[$params_where_name]; } // 根据组件类型处理 diff --git a/app/service/OrderService.php b/app/service/OrderService.php index 56695df9d..572a28a45 100755 --- a/app/service/OrderService.php +++ b/app/service/OrderService.php @@ -54,11 +54,6 @@ class OrderService 'key_name' => 'ids', 'error_msg' => '订单id有误', ], - [ - 'checked_type' => 'empty', - 'key_name' => 'user', - 'error_msg' => '用户信息有误', - ], ]; $ret = ParamsChecked($params, $p); if($ret !== true) @@ -84,7 +79,7 @@ class OrderService foreach($ids as $k=>$order_id) { // 获取订单信息 - $where = ['id'=>intval($order_id), 'user_id' => $params['user']['id']]; + $where = ['id'=>intval($order_id)]; $order = Db::name('Order')->where($where)->find(); if(empty($order)) { @@ -97,6 +92,9 @@ class OrderService return DataReturn('状态不可操作['.$status_text.'-'.$order['order_no'].']', -1); } + // 订单用户 + $order['user'] = UserService::UserHandle(UserService::UserInfo('id', $order['user_id'])); + // 订单数据集合 $order_data[] = $order; $order_ids[] = $order['id']; @@ -126,7 +124,7 @@ class OrderService { $pay_result = self::OrderDirectSuccess([ 'order' => $order, - 'user' => $params['user'], + 'user' => $order['user'], 'params' => $params, ]); if($pay_result['code'] == 0) @@ -222,12 +220,15 @@ class OrderService $redirect_url = MyUrl('index/order/index'); } + // 当前用户 + $current_user = empty($params['user']) ? UserService::LoginUserInfo() : $params['user']; + // 发起支付前处理钩子 $hook_name = 'plugins_service_order_pay_launch_begin'; $ret = EventReturnHandle(MyEventTrigger($hook_name, [ 'hook_name' => $hook_name, 'is_backend' => true, - 'user' => $params['user'], + 'user' => $current_user, 'business_ids' => $order_ids, 'business_nos' => $order_nos, 'total_price' => $total_price, @@ -243,7 +244,7 @@ class OrderService // 新增支付日志 $pay_log = self::OrderPayLogInsert([ - 'user_id' => $params['user']['id'], + 'user_id' => $current_user['id'], 'business_ids' => $order_ids, 'business_nos' => $order_nos, 'total_price' => $total_price, @@ -258,8 +259,8 @@ class OrderService // 发起支付数据 $pay_data = [ 'params' => $params, - 'user' => $params['user'], - 'out_user' => md5($params['user']['id']), + 'user' => $current_user, + 'out_user' => md5($current_user['id']), 'business_type' => 'system-order', 'business_ids' => $order_ids, 'business_nos' => $order_nos,