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
cccdea4f
Commit
cccdea4f
authored
Jun 03, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
c848bf58
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
210 deletions
+1
-210
DailyPaperService.php
application/api_broker/service/DailyPaperService.php
+1
-1
OfficeODaily.php
application/model/OfficeODaily.php
+0
-135
OfficeODailyLog.php
application/model/OfficeODailyLog.php
+0
-74
No files found.
application/api_broker/service/DailyPaperService.php
View file @
cccdea4f
...
...
@@ -185,7 +185,7 @@ class DailyPaperService
$total_shop
=
$payLogModel
->
getTotal
(
$field
,
$params
,
"pay_type"
);
$total_office
=
$officePayLogModel
->
getTotal
(
$field
,
$params
,
"pay_type"
);
$total_arr
=
array_merge
(
$total_shop
,
$total_office
);
$total
[
"alipay"
]
=
0
;
$total
[
"alipay_2"
]
=
0
;
$total
[
"alipay_3"
]
=
0
;
//陈志杰支付宝
...
...
application/model/OfficeODaily.php
deleted
100644 → 0
View file @
c848bf58
<?php
namespace
app\model
;
use
think\Db
;
use
think\Model
;
/**
* Created by PhpStorm.
* User : zw
* Date : 2018/12/17
* Time : 11:26 AM
* Intro:
*/
class
OfficeODaily
extends
BaseModel
{
protected
$table
=
"office_o_daily"
;
private
$db_
;
public
function
__construct
(
$data
=
[])
{
parent
::
__construct
(
$data
);
$this
->
db_
=
Db
::
name
(
$this
->
table
);
}
/**
* @param $field
* @param $params
* @param $page_no
* @param $page_size
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
getDailyList
(
$field
,
$params
,
$page_no
,
$page_size
)
{
$where_
=
[];
if
(
isset
(
$params
[
"agent_id"
]))
{
$where_
[
"agent_id"
]
=
$params
[
"agent_id"
];
}
if
(
isset
(
$params
[
"daily_date"
]))
{
$where_
[
"daily_date"
]
=
$params
[
"daily_date"
];
}
if
(
isset
(
$params
[
"store_id"
]))
{
$where_
[
"store_id"
]
=
$params
[
"store_id"
];
}
if
(
isset
(
$params
[
'id'
]))
{
$where_
[
"id"
]
=
$params
[
'id'
];
}
$where_
[
"is_del"
]
=
0
;
return
$this
->
db_
->
field
(
$field
)
->
where
(
$where_
)
->
page
(
$page_no
)
->
limit
(
$page_size
)
->
select
();
}
/**
* @param $params
* @return int
*/
public
function
addDaily
(
$params
)
{
Db
::
startTrans
();
try
{
$this
->
db_
->
insert
(
$params
);
Db
::
commit
();
return
1
;
}
catch
(
\Exception
$e
)
{
Db
::
rollback
();
return
0
;
}
}
/**
* @param $where
* @param $params
* @return int
*/
public
function
updateDaily
(
$where
,
$params
)
{
Db
::
startTrans
();
try
{
$this
->
where
(
$where
)
->
update
(
$params
);
Db
::
commit
();
return
1
;
}
catch
(
\Exception
$e
)
{
Db
::
rollback
();
return
0
;
}
}
/**
* @param int $pageNo
* @param int $pageSize
* @param string $order_
* @param string $field
* @param string $params
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
getDailyLogList
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'id desc'
,
$field
=
''
,
$params
=
''
)
{
return
$this
->
alias
(
'a'
)
->
field
(
$field
)
->
join
(
'o_daily_log b'
,
'a.id=b.daily_id'
,
'left'
)
->
where
(
$params
)
->
order
(
$order_
)
->
limit
(
$pageSize
)
->
group
(
'a.id'
)
->
page
(
$pageNo
)
->
select
();
}
/**
* @param $params
* @return int|string
*/
public
function
getDailyLogTotal
(
$params
)
{
return
$this
->
alias
(
'a'
)
->
join
(
'o_daily_log b'
,
'a.id=b.daily_id'
,
'left'
)
->
where
(
$params
)
->
group
(
'a.id'
)
->
count
();
}
public
function
getFieldValue
(
$filed
,
$where
)
{
return
$this
->
where
(
$where
)
->
value
(
$filed
);
}
}
\ No newline at end of file
application/model/OfficeODailyLog.php
deleted
100644 → 0
View file @
c848bf58
<?php
namespace
app\model
;
use
think\Db
;
use
think\Model
;
/**
* Created by PhpStorm.
* User : zw
* Date : 2018/12/17
* Time : 2:36 PM
* Intro:
*/
class
OfficeODailyLog
extends
BaseModel
{
protected
$table
=
"office_o_daily_log"
;
private
$db_
;
public
function
__construct
(
$data
=
[])
{
parent
::
__construct
(
$data
);
$this
->
db_
=
Db
::
name
(
$this
->
table
);
}
/**
* @param $field
* @param $params
* @param $page_no
* @param $page_size
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
getDailyLogList
(
$field
,
$params
,
$page_no
,
$page_size
){
$where_
=
[];
if
(
isset
(
$params
[
"daily_id"
])){
$where_
[
"daily_id"
]
=
$params
[
"daily_id"
];
}
if
(
isset
(
$params
[
"operation_id"
])){
$where_
[
"operation_id"
]
=
$params
[
"operation_id"
];
}
if
(
isset
(
$params
[
"operation_status"
])){
$where_
[
"operation_status"
]
=
$params
[
"operation_status"
];
}
if
(
isset
(
$params
[
"is_del"
])){
$where_
[
"is_del"
]
=
$params
[
"is_del"
];
}
return
$this
->
db_
->
field
(
$field
)
->
where
(
$where_
)
->
order
(
"create_time desc"
)
->
page
(
$page_no
)
->
limit
(
$page_size
)
->
select
();
}
/**
* @param $params
* @return int
*/
public
function
addDailyCheck
(
$params
){
Db
::
startTrans
();
try
{
$this
->
db_
->
insert
(
$params
);
Db
::
commit
();
return
1
;
}
catch
(
\Exception
$e
)
{
Db
::
rollback
();
return
0
;
}
}
}
\ No newline at end of file
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