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
9a922800
Commit
9a922800
authored
Sep 21, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
分佣导出
parent
270f36b6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
Finance.php
application/index/controller/Finance.php
+1
-1
OPartialCommission.php
application/model/OPartialCommission.php
+3
-3
No files found.
application/index/controller/Finance.php
View file @
9a922800
...
@@ -812,7 +812,7 @@ class Finance extends Basic
...
@@ -812,7 +812,7 @@ class Finance extends Basic
$where
[]
=
[
'EXP'
,
'b.id ='
.
$this
->
params
[
'bargain_id'
]
.
' or father_id='
.
$this
->
params
[
'bargain_id'
]
];
$where
[]
=
[
'EXP'
,
'b.id ='
.
$this
->
params
[
'bargain_id'
]
.
' or father_id='
.
$this
->
params
[
'bargain_id'
]
];
}
}
$field
=
'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,charity_fund,real_fee,a.real_income_id'
;
$field
=
'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,charity_fund,real_fee,a.real_income_id
,a.should_commission
'
;
$m_commission
=
new
OPartialCommission
();
$m_commission
=
new
OPartialCommission
();
try
{
try
{
...
...
application/model/OPartialCommission.php
View file @
9a922800
...
@@ -122,13 +122,13 @@ class OPartialCommission extends BaseModel
...
@@ -122,13 +122,13 @@ class OPartialCommission extends BaseModel
$result
[
$k
][
'district_store'
]
=
$agent_data
[
'store_name'
]
.
'-'
.
$agent_data
[
'store_name'
];
$result
[
$k
][
'district_store'
]
=
$agent_data
[
'store_name'
]
.
'-'
.
$agent_data
[
'store_name'
];
$result
[
$k
][
'agent'
]
=
$agent_data
[
'name'
]
.
'-'
.
$agent_data
[
'phone'
];
$result
[
$k
][
'agent'
]
=
$agent_data
[
'name'
]
.
'-'
.
$agent_data
[
'phone'
];
}
}
$result
[
$k
][
'
practical_fee'
]
=
$v
[
'practical_fee
'
];
$result
[
$k
][
'
should_commission'
]
=
$v
[
'should_commission
'
];
$result
[
$k
][
'
scale_fee'
]
=
$v
[
'scale
_fee'
];
$result
[
$k
][
'
real_fee'
]
=
$v
[
'real
_fee'
];
$result
[
$k
][
'service_charge'
]
=
$v
[
'service_charge'
];
$result
[
$k
][
'service_charge'
]
=
$v
[
'service_charge'
];
$result
[
$k
][
'charity_fund'
]
=
$v
[
'charity_fund'
];
$result
[
$k
][
'charity_fund'
]
=
$v
[
'charity_fund'
];
$result
[
$k
][
'practical_fee'
]
=
$v
[
'practical_fee'
];
$result
[
$k
][
'practical_fee'
]
=
$v
[
'practical_fee'
];
$result
[
$k
][
'cash'
]
=
$v
[
'cash'
];
$result
[
$k
][
'cash'
]
=
$v
[
'cash'
];
$result
[
$k
][
'
real_fee'
]
=
$v
[
're
al_fee'
];
$result
[
$k
][
'
practical_fee'
]
=
$v
[
'practic
al_fee'
];
}
}
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