|
|
@@ -45,16 +45,16 @@ class PerformanceLogic extends BaseLogic
|
|
|
$coupon_price = RechargeOrder::where('work_id',$work->id)->sum('coupon_price');
|
|
|
switch ($rule['type']){
|
|
|
case 0://按照总金额结算
|
|
|
- $settlement_amount = bcmul($worker_price, $rule['rate']);
|
|
|
+ $settlement_amount = bcmul($work->work_total, $rule['rate'],2);
|
|
|
break;
|
|
|
case 1://按照结算金额结算
|
|
|
$worker_price = $work->work_amount;
|
|
|
- $settlement_amount = bcmul($worker_price, $rule['rate']);
|
|
|
+ $settlement_amount = bcmul($worker_price, $rule['rate'],2);
|
|
|
break;
|
|
|
case 2://按照服务总费用结算
|
|
|
//搜索所有优惠券
|
|
|
$worker_price = $work->service_fee-$coupon_price;
|
|
|
- $settlement_amount = bcmul($worker_price, $rule['rate']);
|
|
|
+ $settlement_amount = bcmul($worker_price, $rule['rate'],2);
|
|
|
break;
|
|
|
default://按照固定金额结算
|
|
|
$worker_price = $work->service_fee-$coupon_price;
|
|
|
@@ -64,6 +64,7 @@ class PerformanceLogic extends BaseLogic
|
|
|
|
|
|
// 缴纳质保金
|
|
|
$masterWorkerInfo = MasterWorker::where('id', $work->master_worker_id)->where('retention_money_status', 1)->findOrEmpty()->toArray();
|
|
|
+ Log::info('缴纳质保金工程师信息:'.json_encode($masterWorkerInfo));
|
|
|
if(!empty($masterWorkerInfo) && $masterWorkerInfo['retention_pay_status'] == 2 && ($masterWorkerInfo['earnest_money'] > $masterWorkerInfo['earnest_money_usable'])){
|
|
|
$retentionData['action'] = WorkerAccountLogEnum::INC;
|
|
|
$retentionData['worker_id'] = $work->master_worker_id;
|
liugc