Commit d72a0783 by 杨树贤

修复数据报错

parent 058b9209
Showing with 4 additions and 0 deletions
...@@ -122,7 +122,9 @@ class SupplierTransformer ...@@ -122,7 +122,9 @@ class SupplierTransformer
$supplier['supplier_group_name'] = array_get(config('fixed.SupplierGroup'), $supplier['supplier_group']); $supplier['supplier_group_name'] = array_get(config('fixed.SupplierGroup'), $supplier['supplier_group']);
$supplier['pay_type_name'] = array_get(config('fixed.SupplierPayType'), $supplier['pay_type']); $supplier['pay_type_name'] = array_get(config('fixed.SupplierPayType'), $supplier['pay_type']);
$supplier['trading_method_name'] = array_get(config('fixed.TradingMethod'), $supplier['trading_method']); $supplier['trading_method_name'] = array_get(config('fixed.TradingMethod'), $supplier['trading_method']);
if (isset($supplier['settlement_type'])) {
$supplier['settlement_type_name'] = array_get(config('field.SettlementType'), $supplier['settlement_type']); $supplier['settlement_type_name'] = array_get(config('field.SettlementType'), $supplier['settlement_type']);
}
$supplier['main_brand_names'] = $this->getMainBrandNames($supplier['main_brands']); $supplier['main_brand_names'] = $this->getMainBrandNames($supplier['main_brands']);
$supplier['update_time'] = $supplier['update_time'] ? date('Y-m-d H:i:s', $supplier['update_time']) : ''; $supplier['update_time'] = $supplier['update_time'] ? date('Y-m-d H:i:s', $supplier['update_time']) : '';
$supplier['create_time'] = $supplier['create_time'] ? date('Y-m-d H:i:s', $supplier['create_time']) : ''; $supplier['create_time'] = $supplier['create_time'] ? date('Y-m-d H:i:s', $supplier['create_time']) : '';
...@@ -139,7 +141,9 @@ class SupplierTransformer ...@@ -139,7 +141,9 @@ class SupplierTransformer
$supplier['extra_fee'] = $ExtendModel->getExtendExtra($supplier['supplier_code'], $supplier['supplier_id']); $supplier['extra_fee'] = $ExtendModel->getExtendExtra($supplier['supplier_code'], $supplier['supplier_id']);
//获取供应商地址信息 //获取供应商地址信息
$supplier = $this->getSupplierAddress($supplier); $supplier = $this->getSupplierAddress($supplier);
if (isset($supplier['supplier_type'])) {
$supplier['supplier_type_name'] = array_get(config('field.SupplierType'), $supplier['supplier_type']); $supplier['supplier_type_name'] = array_get(config('field.SupplierType'), $supplier['supplier_type']);
}
//获取最近修改信息 //获取最近修改信息
$logModel = new LogModel(); $logModel = new LogModel();
$log = $logModel->where('supplier_id', $supplier['supplier_id']) $log = $logModel->where('supplier_id', $supplier['supplier_id'])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment