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
9c5334ac
Commit
9c5334ac
authored
Jul 04, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
a09244a8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
OrderLog.php
application/api_broker/controller/OrderLog.php
+4
-2
OrderLogService.php
application/api_broker/service/OrderLogService.php
+2
-0
OImg.php
application/model/OImg.php
+3
-2
No files found.
application/api_broker/controller/OrderLog.php
View file @
9c5334ac
...
...
@@ -13,6 +13,7 @@ use app\model\OBargainModel;
use
app\model\OMarchInModel
;
use
app\model\ORefundModel
;
use
think\Exception
;
use
Think\Log
;
/**
* Created by PhpStorm.
...
...
@@ -115,8 +116,9 @@ class OrderLog extends Basic
$params
[
"collecting_bill"
]
=
json_decode
(
$params
[
"collecting_bill"
],
true
);
$remark
=
isset
(
$params
[
"remark"
])
?
$params
[
"remark"
]
:
""
;
$transfer_img
=
isset
(
$params
[
"transfer_img"
])
?
$params
[
"transfer_img"
]
:
""
;
$source
=
$params
[
"source"
]
?
$params
[
"source"
]
:
0
;
$transfer_img
=
isset
(
$params
[
"transfer_img"
])
?
json_decode
(
$params
[
"transfer_img"
]
,
true
)
:
""
;
Log
::
record
(
"********************transfer_img**"
.
json_encode
(
$transfer_img
));
$source
=
isset
(
$params
[
"source"
])
?
$params
[
"source"
]
:
0
;
$is_ok
=
$this
->
service_
->
addCollectingBill
(
$params
[
"agent_id"
],
$params
[
"agent_name"
],
$params
[
"report_id"
],
$params
[
"order_id"
],
$params
[
"order_no"
],
$params
[
"collecting_bill"
],
$params
[
"house_number"
],
$params
[
"industry_type"
],
$remark
,
$transfer_img
,
$source
);
...
...
application/api_broker/service/OrderLogService.php
View file @
9c5334ac
...
...
@@ -80,6 +80,7 @@ class OrderLogService
//保存图片
$oImgModel
=
new
OImg
();
$oImgModel
->
addImgAll
(
$father_id
,
2
,
$transfer_img
);
$pushMarchIn
=
new
PushMessageService
(
$params
[
"report_id"
],
2
);
$pushMarchIn
->
pushMarchInMessage
(
$params
[
"report_id"
],
2
);
//推送
}
...
...
@@ -285,6 +286,7 @@ class OrderLogService
$field_pay_log
=
"id,order_no,order_id,agent_id,agent_name,type,pay_type,money,house_number,industry_type,
remark,transfer_img,real_money,source,create_time"
;
$payLogData
=
$oPayLogModel
->
selectPayLogByOrderNo
(
$field_pay_log
,
[
"order_id"
=>
$order_id
]);
if
(
count
(
$payLogData
)
>
0
)
{
foreach
(
$payLogData
as
$k
=>
$v
)
{
$v
[
"step_name"
]
=
"pay_log"
;
...
...
application/model/OImg.php
View file @
9c5334ac
...
...
@@ -11,10 +11,11 @@ namespace app\model;
*/
use
think\Db
;
use
think\Exception
;
use
Think\Log
;
class
OImg
extends
BaseModel
{
protected
$table
=
"o_img"
;
protected
$table
=
"o_img
s
"
;
private
$db_
;
public
function
__construct
(
$data
=
[])
...
...
@@ -53,7 +54,7 @@ class OImg extends BaseModel
* @return int|string
* @throws Exception xx
*/
public
function
addImgAll
(
int
$img_id
,
int
$img_type
,
array
$params
)
:
int
public
function
addImgAll
(
int
$img_id
,
int
$img_type
,
array
$params
)
:
int
{
$imgBin
=
[];
foreach
(
$params
as
$item
)
{
...
...
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