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
98d9eaba
Commit
98d9eaba
authored
Jan 22, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
last_transfer_time
parent
28e154cf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
OrderLog.php
application/api_broker/controller/OrderLog.php
+2
-1
Finance.php
application/index/controller/Finance.php
+1
-1
No files found.
application/api_broker/controller/OrderLog.php
View file @
98d9eaba
...
@@ -236,6 +236,7 @@ class OrderLog extends Basic
...
@@ -236,6 +236,7 @@ class OrderLog extends Basic
$remark
=
isset
(
$params
[
"remark"
])
?
$params
[
"remark"
]
:
""
;
$remark
=
isset
(
$params
[
"remark"
])
?
$params
[
"remark"
]
:
""
;
$transfer_img
=
isset
(
$params
[
"transfer_img"
])
?
json_decode
(
$params
[
"transfer_img"
]
,
true
)
:
""
;
$transfer_img
=
isset
(
$params
[
"transfer_img"
])
?
json_decode
(
$params
[
"transfer_img"
]
,
true
)
:
""
;
$income_time
=
isset
(
$params
[
"income_time"
])
?
$params
[
"income_time"
]
:
""
;
$income_time
=
isset
(
$params
[
"income_time"
])
?
$params
[
"income_time"
]
:
""
;
$last_transfer_time
=
isset
(
$params
[
"last_transfer_time"
])
?
strtotime
(
$params
[
"last_transfer_time"
])
:
""
;
$pay_id
=
isset
(
$params
[
"pay_id"
])
?
$params
[
"pay_id"
]
:
0
;
$pay_id
=
isset
(
$params
[
"pay_id"
])
?
$params
[
"pay_id"
]
:
0
;
$source
=
$params
[
"source"
]
?
$params
[
"source"
]
:
0
;
$source
=
$params
[
"source"
]
?
$params
[
"source"
]
:
0
;
$receipt_number
=
isset
(
$params
[
"receipt_number"
])
?
$params
[
"receipt_number"
]
:
""
;
$receipt_number
=
isset
(
$params
[
"receipt_number"
])
?
$params
[
"receipt_number"
]
:
""
;
...
@@ -248,7 +249,7 @@ class OrderLog extends Basic
...
@@ -248,7 +249,7 @@ class OrderLog extends Basic
$is_ok
=
$this
->
service_
->
addCollectingBill
(
$params
[
"agent_id"
],
$params
[
"agent_name"
],
$params
[
"report_id"
],
$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"
],
$params
[
"order_id"
],
$params
[
"order_no"
],
$params
[
"collecting_bill"
],
$params
[
"house_number"
],
$params
[
"industry_type"
],
$remark
,
$transfer_img
,
$source
,
$income_time
,
$params
[
"is_dividend"
],
$
params
[
"last_transfer_time"
]
,
$pay_id
,
$remark
,
$transfer_img
,
$source
,
$income_time
,
$params
[
"is_dividend"
],
$
last_transfer_time
,
$pay_id
,
$receipt_number
,
$transfer_name
,
$received_money
,
$type_ext
);
$receipt_number
,
$transfer_name
,
$received_money
,
$type_ext
);
if
(
$is_ok
>
0
)
{
if
(
$is_ok
>
0
)
{
...
...
application/index/controller/Finance.php
View file @
98d9eaba
...
@@ -3057,7 +3057,7 @@ class Finance extends Basic
...
@@ -3057,7 +3057,7 @@ class Finance extends Basic
$remark
=
isset
(
$params
[
"remark"
])
?
$params
[
"remark"
]
:
""
;
$remark
=
isset
(
$params
[
"remark"
])
?
$params
[
"remark"
]
:
""
;
$transfer_img
=
isset
(
$params
[
"transfer_img"
])
?
json_decode
(
$params
[
"transfer_img"
],
true
)
:
""
;
$transfer_img
=
isset
(
$params
[
"transfer_img"
])
?
json_decode
(
$params
[
"transfer_img"
],
true
)
:
""
;
$income_time
=
isset
(
$params
[
"income_time"
])
?
strtotime
(
$params
[
"income_time"
])
:
""
;
$income_time
=
isset
(
$params
[
"income_time"
])
?
strtotime
(
$params
[
"income_time"
])
:
""
;
$last_transfer_time
=
isset
(
$params
[
"
income
_time"
])
?
strtotime
(
$params
[
"last_transfer_time"
])
:
""
;
$last_transfer_time
=
isset
(
$params
[
"
last_transfer
_time"
])
?
strtotime
(
$params
[
"last_transfer_time"
])
:
""
;
$pay_id
=
isset
(
$params
[
"pay_id"
])
?
$params
[
"pay_id"
]
:
0
;
$pay_id
=
isset
(
$params
[
"pay_id"
])
?
$params
[
"pay_id"
]
:
0
;
$source
=
$params
[
"source"
]
?
$params
[
"source"
]
:
0
;
$source
=
$params
[
"source"
]
?
$params
[
"source"
]
:
0
;
$receipt_number
=
isset
(
$params
[
"receipt_number"
])
?
$params
[
"receipt_number"
]
:
""
;
$receipt_number
=
isset
(
$params
[
"receipt_number"
])
?
$params
[
"receipt_number"
]
:
""
;
...
...
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