Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
6854336f
Commit
6854336f
authored
Aug 21, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
d9239b18
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
Basic.php
application/api/extend/Basic.php
+1
-0
CostParameter.php
application/index/controller/CostParameter.php
+5
-3
No files found.
application/api/extend/Basic.php
View file @
6854336f
...
...
@@ -68,6 +68,7 @@ class Basic extends Controller
"api/getVersionNoV2"
,
"api/getMarchInList"
,
"api/addSublet"
,
"api/uploadImg"
,
"api/getSiteListApp"
,
"api/recordCallNumShare"
,
"api/addUserCallAgentV2"
,
...
...
application/index/controller/CostParameter.php
View file @
6854336f
...
...
@@ -621,7 +621,6 @@ class CostParameter extends Basic
return
[
"code"
=>
101
,
"msg"
=>
"门店:
{
$v
[
"store_id"
]
}
不存在办公室,导入失败!"
];
}
}
$this
->
addStoreCost
(
$list
,
$setting_date
);
return
[
"code"
=>
200
,
"msg"
=>
"成功"
];
...
...
@@ -641,16 +640,19 @@ class CostParameter extends Basic
$field
=
'a.id,a.store_name'
;
$store_data_res
=
$this
->
m_store
->
getStoreCostParameter
(
$field
,
$f_params
);
big_log
(
$store_data_res
);
if
(
!
$store_data_res
)
{
if
(
!
$v
[
'store_id'
])
continue
;
$transfer_charge
=
$this
->
getTransferCharge
(
$v
[
'store_id'
],
$setting_date
);
$social_security_fee
=
$this
->
getLastSocialSecurityFee
(
$v
[
'id'
],
$setting_date
);
//
$social_security_fee = $this->getLastSocialSecurityFee($v['id'], $setting_date);
$v
[
'setting_date'
]
=
$setting_date
;
$v
[
'is_del'
]
=
0
;
$v
[
'transfer_charge'
]
=
$transfer_charge
;
$v
[
'social_security_fee'
]
=
$social_security_fee
;
// $v['social_security_fee'] = $social_security_fee;
// dump($v);
$this
->
saveStoreData
(
$v
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment