diff --git a/app/admin/form/Order.php b/app/admin/form/Order.php index e086a1bcd..98e22ea64 100644 --- a/app/admin/form/Order.php +++ b/app/admin/form/Order.php @@ -159,12 +159,12 @@ class Order 'view_type' => 'field', 'view_key' => 'order_model', 'view_data_key' => 'name', - 'view_data' => MyConst('common_site_type_list'), + 'view_data' => MyConst('common_order_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_site_type_list'), + 'data' => MyConst('common_order_type_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/index/controller/Order.php b/app/index/controller/Order.php index 528283c62..3ecf005f5 100755 --- a/app/index/controller/Order.php +++ b/app/index/controller/Order.php @@ -241,7 +241,13 @@ class Order extends Common $ret = OrderService::Pay($params); if($ret['code'] == 0) { - return MyRedirect($ret['data']['data']); + // 是否直接成功、则直接进入提示页面并指定支付状态 + if(isset($ret['data']['is_success']) && $ret['data']['is_success'] == 1) + { + return MyRedirect(MyUrl('index/order/respond', ['appoint_status'=>0])); + } else { + return MyRedirect($ret['data']['data']); + } } else { MyViewAssign('msg', $ret['msg']); return MyView('public/tips_error'); diff --git a/app/index/form/Order.php b/app/index/form/Order.php index cc98ece6c..b2db9e153 100644 --- a/app/index/form/Order.php +++ b/app/index/form/Order.php @@ -149,12 +149,12 @@ class Order 'view_type' => 'field', 'view_key' => 'order_model', 'view_data_key' => 'name', - 'view_data' => MyConst('common_site_type_list'), + 'view_data' => MyConst('common_order_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_site_type_list'), + 'data' => MyConst('common_order_type_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/service/ConstService.php b/app/service/ConstService.php index ec2fb59f8..fe596c410 100644 --- a/app/service/ConstService.php +++ b/app/service/ConstService.php @@ -314,6 +314,14 @@ class ConstService 4 => ['value' => 4, 'name' => '销售+自提', 'is_ext' => 1], ], + // 订单类型 + 'common_order_type_list' => [ + 0 => ['value' => 0, 'name' => '销售'], + 1 => ['value' => 1, 'name' => '展示'], + 2 => ['value' => 2, 'name' => '自提'], + 3 => ['value' => 3, 'name' => '虚拟销售'], + ], + // 管理员状态 'common_admin_status_list' => [ 0 => ['value' => 0, 'name' => '正常', 'checked' => true], diff --git a/app/service/OrderService.php b/app/service/OrderService.php index c33fad894..dca0c98ce 100755 --- a/app/service/OrderService.php +++ b/app/service/OrderService.php @@ -172,7 +172,7 @@ class OrderService // 是否直接跳转 if($success_count > 0 && $success_count == count($order_data)) { - return DataReturn('操作成功', 0, ['data'=>MyUrl('index/order/respond', ['appoint_status'=>0]), 'is_success'=>1]); + return DataReturn('操作成功', 0, ['is_success'=>1]); } // 支付入口文件检查 @@ -257,6 +257,7 @@ class OrderService // 发起支付数据 $pay_data = [ + 'params' => $params, 'user' => $params['user'], 'out_user' => md5($params['user']['id']), 'business_type' => 'system-order', @@ -1212,7 +1213,7 @@ class OrderService $order_status_list = MyConst('common_order_status'); $order_pay_status = MyConst('common_order_pay_status'); $common_platform_type = MyConst('common_platform_type'); - $common_site_type_list = MyConst('common_site_type_list'); + $common_order_type_list = MyConst('common_order_type_list'); // 仓库信息 if(in_array('warehouse_id', $keys)) @@ -1311,7 +1312,7 @@ class OrderService } // 订单模式 - $v['order_model_name'] = isset($common_site_type_list[$v['order_model']]) ? $common_site_type_list[$v['order_model']]['name'] : '未知'; + $v['order_model_name'] = isset($common_order_type_list[$v['order_model']]) ? $common_order_type_list[$v['order_model']]['name'] : '未知'; // 客户端 $v['client_type_name'] = isset($common_platform_type[$v['client_type']]) ? $common_platform_type[$v['client_type']]['name'] : '';