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
aaa47d5b
Commit
aaa47d5b
authored
Aug 22, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
4e07b4da
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
CostParameter.php
application/index/controller/CostParameter.php
+10
-8
FStoreData.php
application/model/FStoreData.php
+0
-1
No files found.
application/index/controller/CostParameter.php
View file @
aaa47d5b
...
...
@@ -637,19 +637,21 @@ class CostParameter extends Basic
$f_params
[
'c.store_id'
]
=
$v
[
'store_id'
];
$f_params
[
'c.setting_date'
]
=
$setting_date
;
$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
);
if
(
!
$store_data_res
)
{
if
(
!
$v
[
'store_id'
])
continue
;
$transfer_charge
=
$this
->
getTransferCharge
(
$v
[
'store_id'
],
$setting_date
);
$v
[
'setting_date'
]
=
$setting_date
;
$v
[
'is_del'
]
=
0
;
$v
[
'transfer_charge'
]
=
$transfer_charge
;
$transfer_charge
=
$this
->
getTransferCharge
(
$v
[
'store_id'
],
$setting_date
);
$v
[
'setting_date'
]
=
$setting_date
;
$v
[
'is_del'
]
=
0
;
$v
[
'transfer_charge'
]
=
$transfer_charge
;
if
(
$store_data_res
)
{
//修改
$this
->
updateStoreData
(
$store_data_res
[
'id'
],
$v
);
}
else
{
//新增
$this
->
saveStoreData
(
$v
);
}
}
// $this->saveStoreData($v);
return
true
;
}
...
...
application/model/FStoreData.php
View file @
aaa47d5b
...
...
@@ -27,7 +27,6 @@ class FStoreData extends BaseModel
$data
[
"is_del"
]
=
0
;
$data
[
'create_time'
]
=
$time
;
$data
[
'update_time'
]
=
$time
;
big_log
(
$data
);
return
$this
->
db_
->
insert
(
$data
);
}
...
...
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