liugc vor 1 Jahr
Ursprung
Commit
fab99313cd

+ 19 - 0
app/adminapi/controller/works/ServiceWorkController.php

@@ -24,6 +24,7 @@ use app\adminapi\logic\works\ServiceWorkLogic;
 use app\adminapi\validate\works\ServiceWorkValidate;
 use app\api\logic\ServiceOrderLogic;
 use app\common\logic\ThirdOrderLogic;
+use app\common\model\works\ServiceWork;
 
 
 /**
@@ -66,6 +67,15 @@ class ServiceWorkController extends BaseAdminController
         if (true === $result) {
             if(strtotime($workDetail['appointment_time']) !== strtotime($params['appointment_time']) && !empty($workDetail['master_worker_id'])){
                 $masterDetail = MasterWorkerLogic::detail(['id'=>$workDetail['master_worker_id']]);
+                // 商家改约通知外部平台 即改约
+                if($workDetail['external_platform_id'] > 0){
+                    http_request(env('internal_api.api_url_host').'platf/performanceNotice',http_build_query([
+                        'external_platform_id'=>$workDetail['external_platform_id'],
+                        'send_code'=> 1002,
+                        'work_sn'=> $workDetail['work_sn']
+                    ]));
+                }
+
                 // 修改预约时间通知【给用户的通知】
                 $res = event('Notice',  [
                     'scene_id' => 117,
@@ -141,6 +151,15 @@ class ServiceWorkController extends BaseAdminController
         $result = ServiceWorkLogic::cancel($params);
         if (true === $result) {
             UserEquityLogic::cancelServiceWorkRestoredNumber($params);
+            $serviceWorkInfo = ServiceWork::find($params['id']);
+            // 商家取消通知外部平台 即取消
+            if($serviceWorkInfo['external_platform_id'] > 0){
+                http_request(env('internal_api.api_url_host').'platf/performanceNotice',http_build_query([
+                    'external_platform_id'=>$serviceWorkInfo['external_platform_id'],
+                    'send_code'=> 1005,
+                    'work_sn'=> $serviceWorkInfo['work_sn']
+                ]));
+            }
 
             //判断是否是美团订单,如果是,则取消美团订单
             ThirdOrderLogic::merchantcancelorder($params['id']);

+ 1 - 6
app/adminapi/logic/works/ServiceWorkLogic.php

@@ -436,12 +436,7 @@ class ServiceWorkLogic extends BaseLogic
             Db::commit();
 
             //美团的订单更新履约状态为已分配
-            if($work->third_type == 1 || ($work->external_platform_id > 0)){
-                http_request('https://developer.kyjlkj.com/platf/performanceNotice', http_build_query([
-                    'external_platform_id'=> $work->external_platform_id,
-                    'send_code'=>1003,
-                    'work_sn'=>$work->work_sn,
-                ]));
+            if($work->third_type == 1){
                 ThirdOrderLogic::updateorderfulfillinfo($work,ThirdTypeEnum::MEITUAN_MEITUAN);
             }
 

+ 1 - 6
app/api/controller/notify/UserConfirmController.php

@@ -39,12 +39,7 @@ class UserConfirmController extends BaseApiController
             $params['user_info'] = MasterWorker::where('id',$work['master_worker_id'])->field('worker_number,real_name')->findOrEmpty();//工程师信息
             $params['work_sn'] = $work_sn;
             $result = ServiceWorkLogic::confirmDoor($params);
-            if($work->third_type == 1 || ($work->external_platform_id > 0)){
-                http_request('https://developer.kyjlkj.com/platf/performanceNotice', http_build_query([
-                    'external_platform_id'=> $work->external_platform_id,
-                    'send_code'=>1003,
-                    'work_sn'=>$work['work_sn'],
-                ]));
+            if($work->third_type == 1){
                 $meituan_result = ThirdOrderLogic::updateorderfulfillinfo($work,ThirdTypeEnum::MEITUAN_ARRIVED);
                 Log::write('美团确认上门'.json_encode($meituan_result));
             }

+ 1 - 0
app/common/logic/ThirdOrderLogic.php

@@ -597,6 +597,7 @@ class ThirdOrderLogic extends BaseLogic
      */
     public static function merchantcancelorder($work_id)
     {
+        return '';
         $third_order = ThirdOrders::where('work_id',$work_id)->findOrEmpty();
         if(!$third_order->isEmpty() && !empty($third_order['request_msg']) && $third_order['third_type']==1){
             Log::write('取消美团订单'.$work_id);

+ 8 - 0
app/common/model/works/ServiceWork.php

@@ -44,6 +44,14 @@ class ServiceWork extends BaseModel
     const WORK_STATUS_TXT  = [0=>'待派单',1=>'待领单',2=>'待联系',3=>'待上门',4=>'已上门',5=>'服务中',6=>'待结算',7=>'已完结',8=>'已评价',9=>'已退费'];
     public static function onAfterUpdate($model)
     {
+        // 工单状态通知外部平台 即履约
+        if($model->external_platform_id > 0){
+            http_request(env('internal_api.api_url_host').'platf/performanceNotice',http_build_query([
+                'external_platform_id'=>$model->external_platform_id,
+                'send_code'=> 1003,
+                'work_sn'=> $model->work_sn
+            ]));
+        }
         if($model->user_confirm_status == 5 and $model->work_status == 7 and $model->work_pay_status==1){
             if($model->user_equity_id > 0){
                 // 权益卡不分成于工程师,则不进行结算