Commit aaa47d5b authored by zhuwei's avatar zhuwei

1

parent 4e07b4da
...@@ -637,19 +637,21 @@ class CostParameter extends Basic ...@@ -637,19 +637,21 @@ class CostParameter extends Basic
$f_params['c.store_id'] = $v['store_id']; $f_params['c.store_id'] = $v['store_id'];
$f_params['c.setting_date'] = $setting_date; $f_params['c.setting_date'] = $setting_date;
$f_params['c.is_del'] = 0; $f_params['c.is_del'] = 0;
$field = 'a.id,a.store_name'; $field = 'c.id,a.store_name';
$store_data_res = $this->m_store->getStoreCostParameter($field, $f_params); $store_data_res = $this->m_store->getStoreCostParameter($field, $f_params);
if (!$store_data_res) { $transfer_charge = $this->getTransferCharge($v['store_id'], $setting_date);
if(!$v['store_id']) $v['setting_date'] = $setting_date;
continue; $v['is_del'] = 0;
$transfer_charge = $this->getTransferCharge($v['store_id'], $setting_date); $v['transfer_charge'] = $transfer_charge;
$v['setting_date'] = $setting_date;
$v['is_del'] = 0; if ($store_data_res) {//修改
$v['transfer_charge'] = $transfer_charge; $this->updateStoreData($store_data_res['id'], $v);
} else {//新增
$this->saveStoreData($v); $this->saveStoreData($v);
} }
} }
// $this->saveStoreData($v);
return true; return true;
} }
......
...@@ -27,7 +27,6 @@ class FStoreData extends BaseModel ...@@ -27,7 +27,6 @@ class FStoreData extends BaseModel
$data["is_del"] = 0; $data["is_del"] = 0;
$data['create_time'] = $time; $data['create_time'] = $time;
$data['update_time'] = $time; $data['update_time'] = $time;
big_log($data);
return $this->db_->insert($data); return $this->db_->insert($data);
} }
......
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 to comment