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
006c4222
Commit
006c4222
authored
Apr 23, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
核销参数修改
parent
db2b82c2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Finance.php
application/index/controller/Finance.php
+2
-2
No files found.
application/index/controller/Finance.php
View file @
006c4222
...
...
@@ -1436,7 +1436,7 @@ class Finance extends Basic
return
$this
->
response
(
101
,
'请求参数错误'
);
}
$bargain_data
=
$this
->
m_bargain
->
getCheckBargain
(
'a.id,a.agent_id,a.role,a.create_time,d.store_id,d.district_id,a.report_id'
,
$this
->
params
[
'bargain_id'
]);
$bargain_data
=
$this
->
m_bargain
->
getCheckBargain
(
'a.id,a.agent_id,a.role,a.create_time,d.store_id,d.district_id,a.report_id
,a.order_id
'
,
$this
->
params
[
'bargain_id'
]);
//排除成交报告其它状态
if
(
empty
(
$bargain_data
[
'id'
]))
{
...
...
@@ -1483,7 +1483,7 @@ class Finance extends Basic
$user_id
=
$m_report
->
getFieldValue
(
'user_id'
,[
'id'
=>
$this
->
params
[
'report_id'
]]);
if
(
$user_id
)
{
$service
=
new
ConvertCouponService
();
$service
->
convertCoupon
(
$user_id
,
$
this
->
params
[
'report_id'
],
$this
->
params
[
'bargain_id'
],
$this
->
params
[
'order_id'
]);
//核销红包
$service
->
convertCoupon
(
$user_id
,
$
bargain_data
[
'report_id'
],
$this
->
params
[
'bargain_id'
],
$bargain_data
[
'order_id'
]);
//核销红包
}
}
}
...
...
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