Merge branch 'performance-m' into m--transfer

app/adminapi/logic/master_worker/EngineerSettlementPermanentlyLogic.php

@@ -149,7 +149,7 @@ class EngineerSettlementPermanentlyLogic extends BaseLogic
                 throw new \Exception('结算记录不存在');
             }
             //$amount = SalaryItemPermanently::where('permanently_settlement_id', $params['id'])->sum('term_amount');
-            $settlementPermanently->payment_time = $params['payment_time']??'';
+            $settlementPermanently->payment_time = $params['payment_time']?:date('Y-m-d',  time());
             $settlementPermanently->deduction_amount = $params['deduction_amount']??0;
             $settlementPermanently->deduction_describe = $params['deduction_describe']??'';
             $settlementPermanently->remark = $params['remark']??'';

app/common/model/master_worker/SalaryItemPermanently.php

@@ -87,7 +87,7 @@ class SalaryItemPermanently extends BaseModel
                 'master_worker_id' => $master_worker_id,
                 'term' => 1,
                 'term_amount' => $term_amount,
-                'remark' => $params['item_name'].':  金额--'.$term_amount.'比例：--'.$ratio,
+                'remark' => $params['item_name'].':  金额--'.$term_amount.';比例：--'.$ratio,
                 'extra' => json_encode([
                     'step_days'=>$params['step_days'],'item_name'=>$params['item_name'],
                     'start_time'=>$params['start_time'],'end_time'=>$params['end_time'],'promotion_level'=>$promotion_level,'ratio'=>$ratio,
@@ -125,7 +125,7 @@ class SalaryItemPermanently extends BaseModel
                 'master_worker_id' => $master_worker_id,
                 'term' => 2,
                 'term_amount' => $term_amount,
-                'remark' => $params['item_name'].':  金额--'.$term_amount.'比例：--'.$ratio,
+                'remark' => $params['item_name'].':  金额--'.$term_amount.';比例：--'.$ratio,
                 'extra' => json_encode([
                     'step_days'=>$params['step_days'],'item_name'=>$params['item_name'],
                     'start_time'=>$params['start_time'],'end_time'=>$params['end_time'],'ratio'=>$ratio,
@@ -165,7 +165,7 @@ class SalaryItemPermanently extends BaseModel
                 'master_worker_id' => $master_worker_id,
                 'term' => 3,
                 'term_amount' => $term_amount,
-                'remark' => $params['item_name'].':  金额--'.$term_amount.'排名：前三',
+                'remark' => $params['item_name'].':  金额--'.$term_amount.';排名：前三',
                 'extra' => json_encode([
                     'step_days'=>$params['step_days'],'item_name'=>$params['item_name'],
                     'start_time'=>$params['start_time'],'end_time'=>$params['end_time']
@@ -197,7 +197,7 @@ class SalaryItemPermanently extends BaseModel
                 'master_worker_id' => $master_worker_id,
                 'term' => 4,
                 'term_amount' => $term_amount,
-                'remark' => $params['item_name'].':  金额--'.$term_amount.'评分：--'.$comprehensive_score.'总单量：--'.$order_count,
+                'remark' => $params['item_name'].':  金额--'.$term_amount.';评分：--'.$comprehensive_score.';总单量：--'.$order_count,
                 'extra' => json_encode([
                     'step_days'=>$params['step_days'],'item_name'=>$params['item_name'],
                     'start_time'=>$params['start_time'],'end_time'=>$params['end_time'],'comprehensive_score'=>$comprehensive_score,'order_count'=>$order_count,
@@ -231,7 +231,7 @@ class SalaryItemPermanently extends BaseModel
                 'master_worker_id' => $master_worker_id,
                 'term' => 5,
                 'term_amount' => $amount,
-                'remark' => $params['item_name'].':  金额--'.$amount.'称号：--'.$title_promotion,
+                'remark' => $params['item_name'].':  金额--'.$amount.';称号：--'.$title_promotion,
                 'extra' => json_encode([
                     'step_days'=>$params['step_days'],'item_name'=>$params['item_name'],
                     'title_promotion'=>$title_promotion,
@@ -261,7 +261,7 @@ class SalaryItemPermanently extends BaseModel
                 'master_worker_id' => $master_worker_id,
                 'term' => 6,
                 'term_amount' => $term_amount,
-                'remark' => $params['item_name'].':  扣减金额--'.$term_amount.'投诉单量：--'.$order_count,// .'xx：--'.$ranking
+                'remark' => $params['item_name'].':  扣减金额--'.$term_amount.';投诉单量：--'.$order_count,// .'xx：--'.$ranking
                 'extra' => json_encode([
                     'step_days'=>$params['step_days'],'item_name'=>$params['item_name'],
                     'start_time'=>$params['start_time'],'end_time'=>$params['end_time'],