Commit 7e671a6a by mushishixian

修复交期问题

parent e8d81592
Showing with 3 additions and 3 deletions
...@@ -67,8 +67,8 @@ class SupplierService ...@@ -67,8 +67,8 @@ class SupplierService
$channel['cn_ratio'] = empty($channel['cn_ratio']) ? 1 : $channel['cn_ratio']; $channel['cn_ratio'] = empty($channel['cn_ratio']) ? 1 : $channel['cn_ratio'];
$channel['us_ratio'] = empty($channel['us_ratio']) ? 1 : $channel['us_ratio']; $channel['us_ratio'] = empty($channel['us_ratio']) ? 1 : $channel['us_ratio'];
$channel['cn_delivery_time'] = $channel['cn_delivery_time'] . $channel['cn_delivery_time_period']; $channel['cn_delivery_time'] = $channel['cn_delivery_time'] ? $channel['cn_delivery_time'] . $channel['cn_delivery_time_period'] : '';
$channel['us_delivery_time'] = $channel['us_delivery_time'] . $channel['us_delivery_time_period']; $channel['us_delivery_time'] = $channel['us_delivery_time'] ? $channel['us_delivery_time'] . $channel['us_delivery_time_period'] : '';
$channel['qualification_photos'] = $this->getPhotosData($channel['upload_file']); $channel['qualification_photos'] = $this->getPhotosData($channel['upload_file']);
unset($channel['upload_file']); unset($channel['upload_file']);
$channel['established_time'] = strtotime($channel['established_time']); $channel['established_time'] = strtotime($channel['established_time']);
...@@ -306,7 +306,7 @@ class SupplierService ...@@ -306,7 +306,7 @@ class SupplierService
$model->where('supplier_id', $supplierId)->update([ $model->where('supplier_id', $supplierId)->update([
'to_follow_up' => 1, 'to_follow_up' => 1,
]); ]);
}else{ } else {
$model->where('supplier_id', $supplierId)->update([ $model->where('supplier_id', $supplierId)->update([
'to_follow_up' => 0, 'to_follow_up' => 0,
]); ]);
......
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