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
f94a90a7
Commit
f94a90a7
authored
Mar 26, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支付方式
parent
51ac175f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
Finance.php
application/index/controller/Finance.php
+2
-1
HouseService.php
application/index/service/HouseService.php
+2
-1
No files found.
application/index/controller/Finance.php
View file @
f94a90a7
...
@@ -3296,6 +3296,7 @@ class Finance extends Basic
...
@@ -3296,6 +3296,7 @@ class Finance extends Basic
$excel_data_
[]
=
$v
[
'money'
];
//收款金额
$excel_data_
[]
=
$v
[
'money'
];
//收款金额
$excel_data_
[]
=
$v
[
'real_money'
];
//实付金额
$excel_data_
[]
=
$v
[
'real_money'
];
//实付金额
$excel_data_
[]
=
$v
[
'transaction_fee'
];
//手续费
$excel_data_
[]
=
$v
[
'transaction_fee'
];
//手续费
$excel_data_
[]
=
$v
[
'pay_type'
];
//支付方式
if
(
$v
[
'source'
]
==
2
)
{
//调整收款(调整ID:[%= it[item]['source_id'] %])
if
(
$v
[
'source'
]
==
2
)
{
//调整收款(调整ID:[%= it[item]['source_id'] %])
$excel_data_
[]
=
'调整收款(调整ID:'
.
$v
[
'source_id'
];
//来源
$excel_data_
[]
=
'调整收款(调整ID:'
.
$v
[
'source_id'
];
//来源
...
@@ -3318,7 +3319,7 @@ class Finance extends Basic
...
@@ -3318,7 +3319,7 @@ class Finance extends Basic
}
}
$export
=
new
ExportExcelUntil
();
$export
=
new
ExportExcelUntil
();
$title
=
[
'提交时间'
,
'收款ID'
,
'带看ID'
,
'成交报告ID'
,
'入账日期'
,
'提交人'
,
'对应业务员'
,
'类型'
,
'收款金额(元)'
,
'实付金额'
,
'手续费'
,
'来源'
,
'状态'
];
$title
=
[
'提交时间'
,
'收款ID'
,
'带看ID'
,
'成交报告ID'
,
'入账日期'
,
'提交人'
,
'对应业务员'
,
'类型'
,
'收款金额(元)'
,
'实付金额'
,
'手续费'
,
'支付方式'
,
'来源'
,
'状态'
];
$export
->
exportTable
(
'收款记录'
,
$excel_data
,
12
,
'收款记录'
,
$title
);
$export
->
exportTable
(
'收款记录'
,
$excel_data
,
12
,
'收款记录'
,
$title
);
}
}
...
...
application/index/service/HouseService.php
View file @
f94a90a7
...
@@ -1028,7 +1028,7 @@ class HouseService
...
@@ -1028,7 +1028,7 @@ class HouseService
{
{
$m_video
=
new
GHousesVideo
();
$m_video
=
new
GHousesVideo
();
$field
=
'id,video_name,upload_id,check_name,create_time'
;
$field
=
'id,video_name,upload_id,check_name,create_time
,check_time
'
;
$params
[
'house_id'
]
=
$house_id
;
$params
[
'house_id'
]
=
$house_id
;
$params
[
'is_del'
]
=
0
;
$params
[
'is_del'
]
=
0
;
$params
[
'check_id'
]
=
[
'>'
,
0
];
$params
[
'check_id'
]
=
[
'>'
,
0
];
...
@@ -1054,6 +1054,7 @@ class HouseService
...
@@ -1054,6 +1054,7 @@ class HouseService
$result_
[
$k
][
'video_image'
]
=
$v
[
'video_image'
]
?
$internet_path
.
$v
[
'video_image'
]
:
'http://n.sinaimg.cn/ent/transform/20170921/FVGl-fymesmp0851702.jpg'
;
$result_
[
$k
][
'video_image'
]
=
$v
[
'video_image'
]
?
$internet_path
.
$v
[
'video_image'
]
:
'http://n.sinaimg.cn/ent/transform/20170921/FVGl-fymesmp0851702.jpg'
;
$result_
[
$k
][
'video_path'
]
=
$internet_path
.
$v
[
'video_name'
];
$result_
[
$k
][
'video_path'
]
=
$internet_path
.
$v
[
'video_name'
];
$result_
[
$k
][
'create_time'
]
=
$v
[
'create_time'
];
$result_
[
$k
][
'create_time'
]
=
$v
[
'create_time'
];
$result_
[
$k
][
'check_time'
]
=
$v
[
'check_time'
];
}
}
return
$result_
;
return
$result_
;
...
...
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