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
698f9b75
Commit
698f9b75
authored
Aug 26, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
为空显示提交门店信息
parent
8a998c34
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
Cost.php
application/index/controller/Cost.php
+7
-1
AStore.php
application/model/AStore.php
+1
-0
No files found.
application/index/controller/Cost.php
View file @
698f9b75
...
@@ -290,7 +290,6 @@ class Cost extends Basic
...
@@ -290,7 +290,6 @@ class Cost extends Basic
$cost_service
=
new
CostService
();
$cost_service
=
new
CostService
();
$fee_model
=
new
FApplyForFee
();
$fee_model
=
new
FApplyForFee
();
$m_store_cost
=
new
FStoreCost
();
$m_store_cost
=
new
FStoreCost
();
$m_store_cost_ext
=
new
FStoreCostExt
();
$m_check
=
new
FApplyForFeeCheck
();
$m_check
=
new
FApplyForFeeCheck
();
$m_img
=
new
FImg
();
$m_img
=
new
FImg
();
$redis
=
new
RedisCacheService
();
$redis
=
new
RedisCacheService
();
...
@@ -364,6 +363,13 @@ class Cost extends Basic
...
@@ -364,6 +363,13 @@ class Cost extends Basic
$store_cost_data
[
$k
][
'store_name'
]
=
$m_store
->
getStoreKeyById
(
'store_name'
,
[
'id'
=>
$v
[
'store_id'
]]);
$store_cost_data
[
$k
][
'store_name'
]
=
$m_store
->
getStoreKeyById
(
'store_name'
,
[
'id'
=>
$v
[
'store_id'
]]);
}
}
$data
[
'store_cost_data'
]
=
$store_cost_data
;
$data
[
'store_cost_data'
]
=
$store_cost_data
;
}
else
{
//为空显示提交门店信息
$store_cost_data
[
0
][
'store_name'
]
=
$m_store
->
getStoreKeyById
(
'store_name'
,
[
'id'
=>
$data
[
'store_id'
]]);
$store_cost_data
[
0
][
'id'
]
=
''
;
$store_cost_data
[
0
][
'store_attendance_num'
]
=
$m_store
->
getTotal
([
'id'
=>
$data
[
'store_id'
],
'status'
=>
0
]);
$store_cost_data
[
0
][
'assume_fee'
]
=
$data
[
'total_fee'
];
$data
[
'store_cost_data'
]
=
$store_cost_data
;
}
}
break
;
break
;
}
}
...
...
application/model/AStore.php
View file @
698f9b75
...
@@ -280,6 +280,7 @@ class AStore extends BaseModel
...
@@ -280,6 +280,7 @@ class AStore extends BaseModel
* @return mixed
* @return mixed
*/
*/
public
function
getStoreKeyById
(
$field
,
$where
)
{
public
function
getStoreKeyById
(
$field
,
$where
)
{
$where
[
'status'
]
=
0
;
return
$this
->
where
(
$where
)
return
$this
->
where
(
$where
)
->
value
(
$field
);
->
value
(
$field
);
}
}
...
...
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