Merge branch 'master' into part_0504

app/adminapi/controller/master_worker/MasterWorkerServiceOrderController.php

@@ -5,6 +5,7 @@ use app\adminapi\controller\BaseAdminController;
 use app\adminapi\lists\master_commission\MasterWorkerCommissionNoticeLists;
 use app\adminapi\lists\master_worker\MasterWorkerServiceOrderLists;
 use app\adminapi\logic\export\ExportLogic;
+use app\adminapi\logic\master_worker\MasterWorkerServiceOrderLogic;
 use app\common\service\ExcelExportService;
 
 /**
@@ -63,4 +64,22 @@ class MasterWorkerServiceOrderController extends BaseAdminController
         (new ExcelExportService)->download($result);
         return $this->success('添加成功-'.$result, [], 1, 1);
     }
+
+    /**
+     * @notes 添加
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2024/09/28 15:31
+     */
+    public function behalfVerified()
+    {
+        $params = request()->post();
+        $result = MasterWorkerServiceOrderLogic::add($params);
+        if (true === $result) {
+            return $this->success('已核成功', [], 1, 1);
+        }
+        return $this->fail(MasterWorkerServiceOrderLogic::getError());
+    }
+
+
 }

app/adminapi/lists/master_worker/MasterWorkerServiceOrderLists.php

@@ -5,6 +5,7 @@ use app\adminapi\lists\BaseAdminDataLists;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\goods_category\GoodsCategory;
 use app\common\model\master_worker\MasterWorker;
+use app\common\model\master_worker\MasterWorkerBehalf;
 use app\common\model\master_worker_register\MasterWorkerRegister;
 use app\common\model\works\ServiceWorkAllocateWorkerLog;
 use think\facade\Db;
@@ -57,9 +58,11 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
             $where[] = [ 'a.id','IN',$period_ids?:[0]];
         }
         if (isset($this->params['is_recruiting_behalf']) && !empty($this->params['is_recruiting_behalf'])) {
-            if ($this->params['is_recruiting_behalf'] == 1)
+            if ($this->params['is_recruiting_behalf'] == 1){
                 $where[] = ['a.recruiting_behalf','<>' ,""];
-            else
+                $master_worker_ids = MasterWorkerBehalf::column('master_worker_id')??[];
+                $master_worker_ids && $where[] = ['a.id','not in' ,$master_worker_ids];
+            }else
                 $where[] = ['a.recruiting_behalf','=' ,""];
         }
         if(isset($this->params['category_ids']) && !empty($this->params['category_ids'])){

app/adminapi/lists/works/GroupServiceWorkLists.php

@@ -76,6 +76,14 @@ class GroupServiceWorkLists extends BaseAdminDataLists implements ListsSearchInt
                     break;
             }
         }
+        if(isset($this->params['appointment_time']) && !empty($this->params['appointment_time'][0]) && !empty($this->params['appointment_time'][1])){
+            $time = [strtotime($this->params['appointment_time'][0]), strtotime($this->params['appointment_time'][1])];
+            $where[] = ['appointment_time', 'between', $time];
+        }
+        if(isset($this->params['finished_time']) && !empty($this->params['finished_time'][0]) && !empty($this->params['finished_time'][1])){
+            $time = [strtotime($this->params['finished_time'][0]), strtotime($this->params['finished_time'][1])];
+            $where[] = ['finished_time', 'between', $time];
+        }
         return $where;
     }
     /**

app/adminapi/logic/external/ExternalConsultationLogic.php

@@ -108,10 +108,9 @@ class ExternalConsultationLogic extends BaseLogic
     }
     public static function order(array $params): bool
     {
-        if($params['user_address']){
-            $lon_lat = get_address_lat_lng($params['user_address']);
-            $params['lon'] = $lon_lat['lon'];
-            $params['lat'] = $lon_lat['lat'];
+        if(empty($params['mobile']) || empty($params['lon']) || empty($params['lat']) || empty($params['user_address'])){
+            self::setError('地址坐标信息为必填项');
+            return false;
         }
         Db::startTrans();
         try {

app/adminapi/logic/master_worker/MasterWorkerServiceOrderLogic.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace app\adminapi\logic\master_worker;
+
+use app\common\logic\BaseLogic;
+use app\common\model\master_worker\MasterWorkerBehalf;
+use think\facade\Db;
+class MasterWorkerServiceOrderLogic extends BaseLogic
+{
+    /**
+     * @notes 添加
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2024/09/28 15:31
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            MasterWorkerBehalf::create([
+                'master_worker_id' => $params['master_worker_id'],
+                'recruiting_behalf' => $params['recruiting_behalf']
+            ]);
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+}

app/api/logic/PerformanceLogic.php

@@ -54,18 +54,18 @@ class PerformanceLogic extends BaseLogic
             $coupon_price = RechargeOrder::where('work_id',$work->id)->sum('coupon_price');
             switch ($rule['type']){
                 case 0://按照总金额结算
-                    $settlement_amount = bcmul(bcsub($work->work_total - $work->spare_total), $rule['rate'],2);
+                    $settlement_amount = bcmul(bcsub($work->work_total ,$work->spare_total), $rule['rate'],2);
                     break;
                 case 1://按照结算金额结算
                     $worker_price = $work->work_amount;
                     //$settlement_amount = bcmul($worker_price, $rule['rate'],2);
                     // 运营新定 - 配件费不包进总工单金额扣除
-                    $settlement_amount = bcmul(bcsub($worker_price - $work->spare_total) , $rule['rate'],2);
+                    $settlement_amount = bcmul(bcsub($worker_price ,$work->spare_total) , $rule['rate'],2);
                     break;
                 case 2://按照服务总费用结算
                     //搜索所有优惠券
                     $worker_price = $work->service_fee-$coupon_price;
-                    $settlement_amount = bcmul(bcsub($worker_price - $work->spare_total), $rule['rate'],2);
+                    $settlement_amount = bcmul(bcsub($worker_price,$work->spare_total), $rule['rate'],2);
                     break;
                 default://按照固定金额结算
                     $worker_price = $work->service_fee-$coupon_price;
@@ -162,7 +162,7 @@ class PerformanceLogic extends BaseLogic
             $work->worker_price = $work->work_total;
             //$settlement_amount = bcmul($work->work_total, $ratio,2);
             // 运营新定 - 配件费不包进总工单金额扣除
-            $settlement_amount = bcmul(bcsub($work->worker_price - $work->spare_total), $ratio,2);
+            $settlement_amount = bcmul(bcsub($work->worker_price,$work->spare_total), $ratio,2);
             // 缴纳质保金
             $masterWorkerInfo = MasterWorker::where('id', $work->master_worker_id)->where('retention_money_status', 1)->findOrEmpty()->toArray();
             Log::info('缴纳质保金工程师信息:'.json_encode($masterWorkerInfo));

app/common/model/master_worker/MasterWorkerBehalf.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace app\common\model\master_worker;
+
+use app\common\model\BaseModel;
+
+class MasterWorkerBehalf extends BaseModel
+{
+    protected $name = 'master_worker_behalf';
+}