|
@@ -92,7 +92,7 @@ class MemberService
|
|
|
'member_cert_nbr' => $params['cert_nbr'] ?? '',
|
|
|
'member_cert_birth' => $params['birth'] ? date('Y-m-d', strtotime($params['birth'])) : '',
|
|
|
'member_cert_gender' => $params['gender'] ?? '',
|
|
|
- 'member_cert_province' => $params['province'] ? json_encode($params['province']) : '[]',
|
|
|
+ 'member_cert_province' => $params['province'] ? json_encode($params['province'], JSON_UNESCAPED_UNICODE) : '[]',
|
|
|
'member_cert_city' => $params['city'] ?? '',
|
|
|
'member_cert_addr' => $params['addr'] ?? '',
|
|
|
'member_cert_face' => str_replace(getenv('STORAGE_DOMAIN'), '', $params['member_cert_face']),
|
|
@@ -151,7 +151,7 @@ class MemberService
|
|
|
'member_cert_nbr' => $params['cert_nbr'] ?? '',
|
|
|
'member_cert_birth' => $params['birth'] ? date('Y-m-d', strtotime($params['birth'])) : '',
|
|
|
'member_cert_gender' => $params['gender'] ?? '',
|
|
|
- 'member_cert_province' => $params['province'] ? json_encode($params['province']) : '[]',
|
|
|
+ 'member_cert_province' => $params['province'] ? json_encode($params['province'], JSON_UNESCAPED_UNICODE) : '[]',
|
|
|
'member_cert_city' => $params['city'] ?? '',
|
|
|
'member_cert_addr' => $params['addr'] ?? '',
|
|
|
'member_cert_face' => str_replace(getenv('STORAGE_DOMAIN'), '', $params['member_cert_face']),
|
|
@@ -237,11 +237,11 @@ class MemberService
|
|
|
MemberDevice::insert($data);
|
|
|
|
|
|
// 激活设备
|
|
|
- if (!Device::where('device_id', $params['join_member_device_id'])->whereIn('device_status', ['PROCESSING','PENDING'])->exists()) {
|
|
|
+ if (!Device::where('device_id', $params['join_member_device_id'])->whereIn('device_status', ['PROCESSING', 'PENDING'])->exists()) {
|
|
|
Db::rollBack();
|
|
|
return json_fail('当前设备不是可激活状态');
|
|
|
}
|
|
|
- Device::where('device_id', $params['join_member_device_id'])->update(['device_status'=>'ACTIVED']);
|
|
|
+ Device::where('device_id', $params['join_member_device_id'])->update(['device_status' => 'ACTIVED']);
|
|
|
|
|
|
Db::commit();
|
|
|
} catch (\Exception $e) {
|