|
@@ -267,7 +267,7 @@ class OrderImport extends Base
|
|
|
'contactor',
|
|
|
'mobile',
|
|
|
'addr',
|
|
|
- 'addr_code',
|
|
|
+ 'addr_code' => '',
|
|
|
'token'
|
|
|
], 'post', 'trim');
|
|
|
|
|
@@ -285,7 +285,6 @@ class OrderImport extends Base
|
|
|
'contactor' => 'require',
|
|
|
'mobile' => 'require',
|
|
|
'addr' => 'require',
|
|
|
- 'addr_code' => 'require',
|
|
|
]);
|
|
|
|
|
|
if (!$val->check($param)) return error_show(1004, $val->getError());
|
|
@@ -627,13 +626,13 @@ class OrderImport extends Base
|
|
|
|
|
|
$platform_id = $this->request->post('platform_id/d', 0, 'trim');
|
|
|
|
|
|
- $where=['ps.is_del'=>0];
|
|
|
- if($platform_id !=0) $where['ps.platform_id']=$platform_id;
|
|
|
+ $where = ['ps.is_del' => 0];
|
|
|
+ if ($platform_id != 0) $where['ps.platform_id'] = $platform_id;
|
|
|
|
|
|
$list = Db::name('platform_source')
|
|
|
->alias('ps')
|
|
|
->field('ps.id,ps.platform_id,ps.source,p.platform_name')
|
|
|
- ->leftJoin('platform p','p.id=ps.platform_id AND p.is_del=0')
|
|
|
+ ->leftJoin('platform p', 'p.id=ps.platform_id AND p.is_del=0')
|
|
|
->where($where)
|
|
|
->order('ps.id', 'desc')
|
|
|
->select()
|