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
b78ce3a3
Commit
b78ce3a3
authored
Oct 19, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
错误修改
parent
92c170a9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
OrderLog.php
application/api_broker/controller/OrderLog.php
+1
-1
OrderLogService.php
application/api_broker/service/OrderLogService.php
+2
-2
PushMessageService.php
application/api_broker/service/PushMessageService.php
+4
-3
No files found.
application/api_broker/controller/OrderLog.php
View file @
b78ce3a3
...
@@ -73,7 +73,7 @@ class OrderLog extends Basic
...
@@ -73,7 +73,7 @@ class OrderLog extends Basic
$is_ok
=
$this
->
o_march_in_model
->
addMarchIn
(
$params
);
$is_ok
=
$this
->
o_march_in_model
->
addMarchIn
(
$params
);
if
(
$is_ok
>
0
)
{
if
(
$is_ok
>
0
)
{
$pushMarchIn
=
new
PushMessageService
();
$pushMarchIn
=
new
PushMessageService
();
$pushMarchIn
->
pushMarchInMessage
(
$params
[
"report_id"
]);
//推送
$pushMarchIn
->
pushMarchInMessage
(
$params
[
"report_id"
]
,
1
,
$params
[
"report_id"
]
);
//推送
return
$this
->
response
(
"200"
,
"request success"
,
[]);
return
$this
->
response
(
"200"
,
"request success"
,
[]);
}
else
{
}
else
{
return
$this
->
response
(
"101"
,
"request faild"
);
return
$this
->
response
(
"101"
,
"request faild"
);
...
...
application/api_broker/service/OrderLogService.php
View file @
b78ce3a3
...
@@ -128,8 +128,8 @@ class OrderLogService
...
@@ -128,8 +128,8 @@ class OrderLogService
}
}
}
}
if
(
$father_id
>
0
)
{
if
(
$father_id
>
0
)
{
$pushMarchIn
=
new
PushMessageService
(
$params
[
"report_id"
],
2
);
$pushMarchIn
=
new
PushMessageService
();
$pushMarchIn
->
pushMarchInMessage
(
$params
[
"report_id"
],
2
);
//推送
$pushMarchIn
->
pushMarchInMessage
(
$params
[
"report_id"
],
2
,
$agent_id
);
//推送
}
}
//todo if bill_arr not null, save database table
//todo if bill_arr not null, save database table
if
(
!
empty
(
$bill_arr
))
{
if
(
!
empty
(
$bill_arr
))
{
...
...
application/api_broker/service/PushMessageService.php
View file @
b78ce3a3
...
@@ -60,13 +60,14 @@ class PushMessageService
...
@@ -60,13 +60,14 @@ class PushMessageService
/**
/**
* 1.进场推送 2.收款推送
* 1.进场推送 2.收款推送
*
*
* @param int $report_id
* @param $report_id
* @param int $type
* @param $type
* @param $operation_id
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\DbException
*/
*/
public
function
pushMarchInMessage
(
$report_id
=
0
,
$type
=
1
,
$operation_id
)
public
function
pushMarchInMessage
(
$report_id
,
$type
,
$operation_id
)
{
{
$report
=
new
OReportModel
();
$report
=
new
OReportModel
();
...
...
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