sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

动态表格列表+订单优化

feat/task1-c-wallet
gongfuxiang 2022-02-23 10:51:04 +08:00
parent 81e587fb48
commit f50e9e2ef1
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/form/Order.php
View File

@ -281,7 +281,7 @@ class Order
'view_key' => 'user_note',
'is_sort' => 1,
'search_config' => [
'form_type' => 'select',
'form_type' => 'input',
'where_type' => 'like',
],
],

2
app/admin/view/default/public/module/form_table.html
View File

@ -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 : [],
])}}

2
app/index/form/Order.php
View File

@ -271,7 +271,7 @@ class Order
'view_key' => 'user_note',
'is_sort' => 1,
'search_config' => [
'form_type' => 'select',
'form_type' => 'input',
'where_type' => 'like',
],
],

2
app/index/view/default/public/module/form_table.html
View File

@ -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 : [],
])}}

5
app/module/FormHandleModule.php
View File

@ -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];
}
// 根据组件类型处理

23
app/service/OrderService.php
View File

@ -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,