|
@@ -159,18 +159,18 @@ class Index extends Api
|
|
|
}
|
|
|
|
|
|
$id = input('id', 0, 'intval');
|
|
|
- $collectionplace = input('collectionplace', '', 'trim');
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
$active_people = input('active_people', '', 'trim');
|
|
|
$paytype = input('paytype', 0, 'intval');
|
|
|
$total_price = input('total_price', 0, 'trim');
|
|
|
|
|
|
- if ($collectionplace === '' || iconv_strlen($collectionplace, 'utf-8') > 255) {
|
|
|
- $this->error('请选择集合地点');
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if (!preg_match('/^[0-9]+(.[0-9]{1,2})?$/', $total_price) || $total_price < 0) {
|
|
|
$this->error('合计价格错误');
|
|
|
}
|
|
@@ -264,6 +264,11 @@ class Index extends Api
|
|
|
$this->error('保险信息错误');
|
|
|
break;
|
|
|
}
|
|
|
+
|
|
|
+ if ($v['collectionplace'] === '' || iconv_strlen($v['collectionplace'] , 'utf-8') > 255) {
|
|
|
+ $this->error($v['name'] . '请选择集合地点');
|
|
|
+ break;
|
|
|
+ }
|
|
|
|
|
|
if ($v['is_self'] && $k == 0) {
|
|
|
|
|
@@ -455,7 +460,7 @@ class Index extends Api
|
|
|
|
|
|
$data['active_id'] = $id;
|
|
|
$data['user_id'] = $this->auth->id;
|
|
|
- $data['collectionplace'] = $collectionplace;
|
|
|
+ $data['collectionplace'] = $v['collectionplace'];
|
|
|
$data['credtype'] = $v['credtype'];
|
|
|
$data['insurance'] = $v['insurance'];
|
|
|
$data['originalprice'] = $info['price'];
|
|
@@ -481,7 +486,7 @@ class Index extends Api
|
|
|
$order_data['order_sn'] = date('YmdHis', time()) . rand(10000000, 99999999);
|
|
|
$order_data['active_id'] = $id;
|
|
|
$order_data['user_id'] = $this->auth->id;
|
|
|
- $order_data['collectionplace'] = $collectionplace;
|
|
|
+
|
|
|
$order_data['paytype'] = $paytype;
|
|
|
$order_data['price'] = $total_amount;
|
|
|
$order_data['number'] = count($active_people_arr);
|