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
43528cc3
Commit
43528cc3
authored
Jun 13, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
d76b10bf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
DailyPaper.php
application/index/controller/DailyPaper.php
+4
-4
OfficeOPayLogModel.php
application/model/OfficeOPayLogModel.php
+5
-3
No files found.
application/index/controller/DailyPaper.php
View file @
43528cc3
...
@@ -36,12 +36,12 @@ class DailyPaper extends Basic
...
@@ -36,12 +36,12 @@ class DailyPaper extends Basic
{
{
header
(
'Access-Control-Allow-Origin:*'
);
header
(
'Access-Control-Allow-Origin:*'
);
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/*
$params = array(
$params
=
array
(
"store_id" => 0,//门店id
"store_id"
=>
73
0
,
//门店id
"is_store"
=>
0
,
//身份是否是店长,财务显示不一样 0店长 1财务
"is_store"
=>
0
,
//身份是否是店长,财务显示不一样 0店长 1财务
"daily_data" => "2019-06-
0
3"
"daily_data"
=>
"2019-06-
1
3"
);
);
$this->userId =
1;*/
$this
->
userId
=
5775
;
if
(
!
isset
(
$params
[
"store_id"
])
||
!
isset
(
$params
[
"is_store"
])
||
!
isset
(
$params
[
"daily_data"
]))
{
if
(
!
isset
(
$params
[
"store_id"
])
||
!
isset
(
$params
[
"is_store"
])
||
!
isset
(
$params
[
"daily_data"
]))
{
return
$this
->
response
(
"101"
,
"请求参数错误"
);
return
$this
->
response
(
"101"
,
"请求参数错误"
);
}
}
...
...
application/model/OfficeOPayLogModel.php
View file @
43528cc3
...
@@ -457,12 +457,14 @@ class OfficeOPayLogModel extends Model
...
@@ -457,12 +457,14 @@ class OfficeOPayLogModel extends Model
*/
*/
public
function
selectPayLogListByBargainReport
(
$filed
,
$params
)
public
function
selectPayLogListByBargainReport
(
$filed
,
$params
)
{
{
return
$this
->
db_
->
field
(
$filed
)
$result
=
$this
->
db_
->
field
(
$filed
)
->
alias
(
"a"
)
->
alias
(
"a"
)
->
join
(
"o_order b"
,
"a.order_id = b.id"
,
"left"
)
->
join
(
"o
ffice_o
_order b"
,
"a.order_id = b.id"
,
"left"
)
->
join
(
"o_report d"
,
"a.report_id = d.id"
,
"left"
)
->
join
(
"o
ffice_o
_report d"
,
"a.report_id = d.id"
,
"left"
)
->
where
(
$params
)
->
where
(
$params
)
->
select
();
->
select
();
//echo $this->getLastSql();
return
$result
;
}
}
...
...
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