Commit c2ce7f32 authored by zhuwei's avatar zhuwei

1

parent 26c33c04
......@@ -50,8 +50,12 @@ class CostParameter extends Basic
$pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
$conditions = [];
$checkResult = $this->validate($params, "CostParameterValidate.getStoreCostParameterList");
if (true !== $checkResult) {
return $this->response("101", $checkResult);
}
$conditions = [];
//门店
if (!empty($params['store_id'])) {
$conditions["a.id"] = $params["store_id"];
......@@ -70,9 +74,9 @@ class CostParameter extends Basic
$f_params['c.setting_date'] = $params['setting_date'];
$store_data_res = $this->m_store->getStoreCostParameter($field,$f_params);
if(!$store_data_res){
$transfer_charge = $this->getTransferCharge(730);
$transfer_charge = $this->getTransferCharge($v['id']);
$list[$k]['transfer_charge'] = $transfer_charge;//手续费
$social_security_fee = $this->getLastSocialSecurityFee(730);
$social_security_fee = $this->getLastSocialSecurityFee($v['id']);
$list[$k]['social_security_fee'] = $social_security_fee;//当月社保报销
$list[$k]['attendance_num'] = 0;//当月考勤
$list[$k]['official_receipts'] = 0;//当月合计总实收
......
......@@ -28,6 +28,7 @@ class CostParameterValidate extends Validate {
protected $scene = [
'editCostParameter' => [ 'store_id', 'setting_date' ],
'getCompanyCostParameterList' => [ 'setting_date' ],
'getStoreCostParameterList' => [ 'setting_date' ],
'editCompanyData' => [ 'type', 'setting_date' ],
];
......
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