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
7fc4f0bf
Commit
7fc4f0bf
authored
Dec 26, 2018
by
zw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
时间轴
parent
066c72c5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
15 deletions
+31
-15
OrderLogService.php
application/api_broker/service/OrderLogService.php
+31
-15
No files found.
application/api_broker/service/OrderLogService.php
View file @
7fc4f0bf
...
@@ -12,6 +12,7 @@ use app\model\OPayLogAdjustment;
...
@@ -12,6 +12,7 @@ use app\model\OPayLogAdjustment;
use
app\model\OPayLogModel
;
use
app\model\OPayLogModel
;
use
app\model\OrderModel
;
use
app\model\OrderModel
;
use
app\model\ORealIncome
;
use
app\model\ORealIncome
;
use
app\model\ORefundLogModel
;
use
app\model\ORefundModel
;
use
app\model\ORefundModel
;
use
app\model\OReportModel
;
use
app\model\OReportModel
;
use
app\model\OTaxes
;
use
app\model\OTaxes
;
...
@@ -116,7 +117,7 @@ class OrderLogService
...
@@ -116,7 +117,7 @@ class OrderLogService
*/
*/
public
function
addCollectingBill
(
$agent_id
,
$agent_name
,
$report_id
,
$order_id
,
$order_no
,
$collecting_bill
,
$house_number
,
public
function
addCollectingBill
(
$agent_id
,
$agent_name
,
$report_id
,
$order_id
,
$order_no
,
$collecting_bill
,
$house_number
,
$industry_type
,
$remark
,
$transfer_img
,
$source
,
$income_time
,
$is_dividend
,
$industry_type
,
$remark
,
$transfer_img
,
$source
,
$income_time
,
$is_dividend
,
$last_transfer_time
,
$pay_id
,
$receipt_number
,
$transfer_name
)
$last_transfer_time
,
$pay_id
,
$receipt_number
,
$transfer_name
)
{
{
$bill_arr
=
$params
=
[];
$bill_arr
=
$params
=
[];
$father_id
=
0
;
$father_id
=
0
;
...
@@ -124,32 +125,32 @@ class OrderLogService
...
@@ -124,32 +125,32 @@ class OrderLogService
$type
=
0
;
$type
=
0
;
foreach
(
$collecting_bill
as
$collecting
)
{
foreach
(
$collecting_bill
as
$collecting
)
{
if
(
isset
(
$collecting
[
"type"
])
&&
isset
(
$collecting
[
"pay_type"
])
&&
isset
(
$collecting
[
"money"
]))
{
if
(
isset
(
$collecting
[
"type"
])
&&
isset
(
$collecting
[
"pay_type"
])
&&
isset
(
$collecting
[
"money"
]))
{
if
(
!
$this
->
verifyType
(
$collecting
[
"type"
],
$collecting
[
"pay_type"
],
$receipt_number
))
{
if
(
!
$this
->
verifyType
(
$collecting
[
"type"
],
$collecting
[
"pay_type"
],
$receipt_number
))
{
return
-
1
;
return
-
1
;
}
}
$money
=
$collecting
[
"money"
];
$money
=
$collecting
[
"money"
];
$type
=
$collecting
[
"type"
];
$type
=
$collecting
[
"type"
];
if
(
$pay_id
>
0
)
{
if
(
$pay_id
>
0
)
{
$is_ok
=
$this
->
verifyMoney
(
$pay_id
,
$money
);
$is_ok
=
$this
->
verifyMoney
(
$pay_id
,
$money
);
if
(
$is_ok
!=
0
)
{
if
(
$is_ok
!=
0
)
{
return
$is_ok
;
return
$is_ok
;
}
}
}
}
if
(
$father_id
==
0
)
{
if
(
$father_id
==
0
)
{
$params
=
$this
->
collectingBillBin
(
$father_id
,
$collecting
,
$agent_id
,
$agent_name
,
$report_id
,
$params
=
$this
->
collectingBillBin
(
$father_id
,
$collecting
,
$agent_id
,
$agent_name
,
$report_id
,
$order_id
,
$order_no
,
$house_number
,
$industry_type
,
$remark
,
$transfer_img
,
$source
,
$income_time
,
$order_id
,
$order_no
,
$house_number
,
$industry_type
,
$remark
,
$transfer_img
,
$source
,
$income_time
,
$is_dividend
,
$last_transfer_time
,
$receipt_number
,
$transfer_name
);
$is_dividend
,
$last_transfer_time
,
$receipt_number
,
$transfer_name
);
$father_id
=
$this
->
payLogModel
->
insertPayLog
(
$params
);
$father_id
=
$this
->
payLogModel
->
insertPayLog
(
$params
);
}
else
{
}
else
{
array_push
(
$bill_arr
,
$this
->
collectingBillBin
(
$father_id
,
$collecting
,
$agent_id
,
$agent_name
,
array_push
(
$bill_arr
,
$this
->
collectingBillBin
(
$father_id
,
$collecting
,
$agent_id
,
$agent_name
,
$report_id
,
$order_id
,
$order_no
,
$house_number
,
$industry_type
,
$remark
,
$transfer_img
,
$source
,
$report_id
,
$order_id
,
$order_no
,
$house_number
,
$industry_type
,
$remark
,
$transfer_img
,
$source
,
$income_time
,
$is_dividend
,
$last_transfer_time
,
$receipt_number
,
$transfer_name
));
$income_time
,
$is_dividend
,
$last_transfer_time
,
$receipt_number
,
$transfer_name
));
}
}
}
}
}
}
if
(
$father_id
>
0
)
{
if
(
$father_id
>
0
)
{
//保存图片
//保存图片
if
(
$transfer_img
)
{
if
(
$transfer_img
)
{
$oImgModel
=
new
OImg
();
$oImgModel
=
new
OImg
();
$oImgModel
->
addImgAll
(
$father_id
,
2
,
$transfer_img
);
$oImgModel
->
addImgAll
(
$father_id
,
2
,
$transfer_img
);
}
}
...
@@ -175,10 +176,11 @@ class OrderLogService
...
@@ -175,10 +176,11 @@ class OrderLogService
* @param $money
* @param $money
* @return int
* @return int
*/
*/
private
function
verifyMoney
(
$pay_id
,
$money
){
private
function
verifyMoney
(
$pay_id
,
$money
)
{
$payLogService
=
new
PayLogService
();
$payLogService
=
new
PayLogService
();
$residue_money
=
$payLogService
->
adjustment
(
$pay_id
);
$residue_money
=
$payLogService
->
adjustment
(
$pay_id
);
if
(
$residue_money
<
$money
)
{
if
(
$residue_money
<
$money
)
{
return
-
2
;
return
-
2
;
}
}
return
0
;
return
0
;
...
@@ -190,7 +192,7 @@ class OrderLogService
...
@@ -190,7 +192,7 @@ class OrderLogService
* @param $receipt_number
* @param $receipt_number
* @return bool
* @return bool
*/
*/
private
function
verifyType
(
$type
,
$pay_type
,
$receipt_number
)
private
function
verifyType
(
$type
,
$pay_type
,
$receipt_number
)
{
{
switch
(
$pay_type
)
{
switch
(
$pay_type
)
{
...
@@ -274,7 +276,7 @@ class OrderLogService
...
@@ -274,7 +276,7 @@ class OrderLogService
*/
*/
private
function
collectingBillBin
(
$father_id
,
$collecting_arr
,
$agent_id
,
$agent_name
,
$report_id
,
$order_id
,
private
function
collectingBillBin
(
$father_id
,
$collecting_arr
,
$agent_id
,
$agent_name
,
$report_id
,
$order_id
,
$order_no
,
$house_number
,
$industry_type
,
$remark
,
$transfer_img
,
$source
,
$order_no
,
$house_number
,
$industry_type
,
$remark
,
$transfer_img
,
$source
,
$income_time
,
$is_dividend
,
$last_transfer_time
,
$receipt_number
,
$transfer_name
)
$income_time
,
$is_dividend
,
$last_transfer_time
,
$receipt_number
,
$transfer_name
)
{
{
$arr
[
"report_id"
]
=
$report_id
;
$arr
[
"report_id"
]
=
$report_id
;
...
@@ -545,6 +547,7 @@ class OrderLogService
...
@@ -545,6 +547,7 @@ class OrderLogService
$oRefundModel
=
new
ORefundModel
();
$oRefundModel
=
new
ORefundModel
();
$oBargainModel
=
new
OBargainModel
();
$oBargainModel
=
new
OBargainModel
();
$oPayLogAdjustmentModel
=
new
OPayLogAdjustment
();
$oPayLogAdjustmentModel
=
new
OPayLogAdjustment
();
$oRefundLogModel
=
new
ORefundLogModel
();
$orderData
=
$orderModel
->
selectOrderByOrderId
(
"a.f_id,a.house_title,b.internal_address"
,
[
"order_id"
=>
$order_id
]);
$orderData
=
$orderModel
->
selectOrderByOrderId
(
"a.f_id,a.house_title,b.internal_address"
,
[
"order_id"
=>
$order_id
]);
...
@@ -629,15 +632,28 @@ class OrderLogService
...
@@ -629,15 +632,28 @@ class OrderLogService
$result
[
$sort
++
]
=
$v2
;
$result
[
$sort
++
]
=
$v2
;
}
}
}
}
//调整
$field_adjustment
=
"a.id,a.paylog_id,a.new_paylog_id,a.type,a.money,a.create_time,a.update_time,c.name"
;
$field_adjustment
=
"a.id,a.paylog_id,a.new_paylog_id,a.type,a.money,a.create_time,a.update_time,c.name"
;
$adjustmentData
=
$oPayLogAdjustmentModel
->
getAdjustmentListByOrderId
(
$field_adjustment
,
[
"order_id"
=>
$order_id
]);
$adjustmentData
=
$oPayLogAdjustmentModel
->
getAdjustmentListByOrderId
(
$field_adjustment
,
[
"order_id"
=>
$order_id
]);
if
(
count
(
$adjustmentData
)
>
0
)
{
if
(
count
(
$adjustmentData
)
>
0
)
{
foreach
(
$adjustmentData
as
$k2
=>
$v2
)
{
foreach
(
$adjustmentData
as
$k2
=>
$v2
)
{
$v2
[
"step_name"
]
=
"adjustment"
;
$v2
[
"step_name"
]
=
"adjustment"
;
$result
[
$sort
++
]
=
$v2
;
$result
[
$sort
++
]
=
$v2
;
}
}
}
}
//退款审核
$field_turn_down
=
""
;
$turn_down
[
"order_id"
]
=
$order_id
;
$turn_down
[
"status"
]
=
array
(
"in"
,
(
"2,4"
));
$turnDownData
=
$oRefundLogModel
->
getListAll
(
$field_turn_down
,
$turn_down
);
if
(
count
(
$turnDownData
)
>
0
)
{
foreach
(
$turnDownData
as
$k2
=>
$v2
)
{
$v2
[
"step_name"
]
=
"refund_check"
;
$v
[
"img_path"
]
=
CHAT_IMG_URL
;
$v
[
"img"
]
=
$this
->
getOImg
(
$v
[
"id"
],
4
);
$result
[
$sort
++
]
=
$v2
;
}
}
return
$this
->
sortByTime
(
$result
);
return
$this
->
sortByTime
(
$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