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
47ed54b3
Commit
47ed54b3
authored
Aug 08, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
983d253b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
4 deletions
+24
-4
Finance.php
application/index/controller/Finance.php
+2
-2
ImageDepot.php
application/index/controller/ImageDepot.php
+5
-2
OPayLogModel.php
application/model/OPayLogModel.php
+17
-0
No files found.
application/index/controller/Finance.php
View file @
47ed54b3
...
...
@@ -4428,9 +4428,9 @@ class Finance extends Basic
$m_pay_log
=
new
OPayLogModel
();
$s_receipt_operating_records
=
new
ReceiptOperatingRecords
();
$pay_log_info
=
$m_pay_log
->
getPayLogByOrderId
(
"b.house_id"
,
[
'id'
=>
$new_pay_log_id
]);
$pay_log_info
=
$m_pay_log
->
getPayLogByOrderId
V2
(
"b.house_id"
,
[
'id'
=>
$new_pay_log_id
]);
$s_receipt_operating_records
->
addOperating
(
$this
->
userId
,
$type
,
$new_pay_log_id
,
$pay_log_info
[
0
][
"house_id"
]);
//$agents_id,$type,$remark,$pay_log_id
$s_receipt_operating_records
->
addOperating
(
$this
->
userId
,
$type
,
$new_pay_log_id
,
$pay_log_info
[
0
][
'house_id'
]);
//$agents_id,$type,$remark,$pay_log_id
}
public
function
getAdjustmentDetail
()
{
...
...
application/index/controller/ImageDepot.php
View file @
47ed54b3
...
...
@@ -6,6 +6,7 @@ use app\index\extend\Basic;
use
app\index\service\UserAgentService
;
use
app\index\service\UserSiteService
;
use
app\model\GImageDepot
;
use
app\model\OPayLogModel
;
/**
* zhuwei
...
...
@@ -180,8 +181,10 @@ class ImageDepot extends Basic
public
function
ceshi
()
{
header
(
'Content-Type:text/json;charset=utf-8'
);
echo
json_encode
([
'name'
=>
'xiaom'
,
'name'
=>
'xiaom2'
]);
$m_pay_log
=
new
OPayLogModel
();
$pay_log_info
=
$m_pay_log
->
getPayLogByOrderId
(
"b.house_id"
,
[
'id'
=>
1126
]);
dump
(
$pay_log_info
[
0
][
'house_id'
]);
}
...
...
application/model/OPayLogModel.php
View file @
47ed54b3
...
...
@@ -155,6 +155,23 @@ class OPayLogModel extends Model
->
select
();
}
public
function
getPayLogByOrderIdV2
(
$field
,
$params
)
{
$where_
=
[];
if
(
isset
(
$params
[
"id"
]))
{
$where_
[
"a.id"
]
=
$params
[
"id"
];
}
return
Db
::
table
(
$this
->
table
)
->
field
(
$field
)
->
alias
(
"a"
)
->
join
(
"o_order b"
,
"a.order_id = b.id"
,
"left"
)
->
join
(
"a_agents c"
,
"a.agent_id = c.id"
,
"left"
)
->
join
(
"a_store d"
,
"c.store_id = d.id"
,
"left"
)
->
where
(
$where_
)
->
select
();
}
/**
* @param $params
...
...
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