liugc 1 год назад
Родитель
Сommit
2991328eae

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

@@ -436,7 +436,12 @@ class ServiceWorkLogic extends BaseLogic
             Db::commit();
 
             //美团的订单更新履约状态为已分配
-            if($work->third_type == 1){
+            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,
+                ]));
                 ThirdOrderLogic::updateorderfulfillinfo($work,ThirdTypeEnum::MEITUAN_MEITUAN);
             }
 

+ 13 - 0
app/api/controller/notify/MeiTuanNotifyController.php

@@ -83,6 +83,7 @@ class MeiTuanNotifyController extends BaseApiController
      */
     public function cancellation()
     {
+        return '';
         http_request('https://developer.kyjlkj.com/platf/kaidianbao/cancellationByUser',http_build_query($this->request->param()));
         Log::write('取消预订:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
         $order = $this->request->param();
@@ -96,6 +97,7 @@ class MeiTuanNotifyController extends BaseApiController
      */
     public function bookingResults()
     {
+        return '';
         http_request('https://developer.kyjlkj.com/platf/kaidianbao/reservationResults',http_build_query($this->request->param()));
         Log::write('预订结果同步:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
     }
@@ -106,6 +108,7 @@ class MeiTuanNotifyController extends BaseApiController
     */
     public function booking()
     {
+        return '';
         http_request('https://developer.kyjlkj.com/platf/kaidianbao/reservation',http_build_query($this->request->param()));
         $order = $this->request->param();
         Log::write('开始预约:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
@@ -122,6 +125,7 @@ class MeiTuanNotifyController extends BaseApiController
      */
     public function changeBooking()
     {
+        return '';
         http_request('https://developer.kyjlkj.com/platf/kaidianbao/reschedulingByUser',http_build_query($this->request->param()));
         $order = $this->request->param();
         Log::write('改约提交:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
@@ -206,12 +210,14 @@ class MeiTuanNotifyController extends BaseApiController
      */
     public function notify5810007()
     {
+        return '';
         http_request('https://developer.kyjlkj.com/platf/kaidianbao/reschedulingResults',http_build_query($this->request->param()));
         Log::write('改约结果通知三方:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
     }
 
     public function notify5810009()
     {
+        return '';
         http_request('https://developer.kyjlkj.com/platf/Kaidianbao/inventory',http_build_query($this->request->param()));
         Log::write('到家行业库存查询:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
     }
@@ -223,17 +229,20 @@ class MeiTuanNotifyController extends BaseApiController
 
     public function notify5810023()
     {
+        return '';
         http_request('https://developer.kyjlkj.com/platf/Kaidianbao/completedDetails',http_build_query($this->request->param()));
         Log::write('核销状态查询:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
     }
 
     public function notify5810027()
     {
+        return '';
         Log::write('通知三方核销:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
     }
 
     public function notify5810029()
     {
+        return '';
         http_request('https://developer.kyjlkj.com/platf/Kaidianbao/completedByArrears',http_build_query($this->request->param()));
         //尾款结算2--维修的尾款订单信息增加
         //获取工单信息
@@ -319,6 +328,7 @@ class MeiTuanNotifyController extends BaseApiController
 
     public function notify5810031()
     {
+        return '';
         http_request('https://developer.kyjlkj.com/platf/Kaidianbao/completedByUser',http_build_query($this->request->param()));
         //尾款结算1        //尾款结算3
         //获取工单信息
@@ -402,6 +412,7 @@ class MeiTuanNotifyController extends BaseApiController
 
     public function notify5810099()
     {
+        return '';
         //尾款结算4
 //        {"opBizCode":"AE7MKOJAV67338LIC3UD0K5TGIO","msgType":"5810099","developerId":"114657","businessId":"58","sign":"a726ef82351172679a8faf83e1c687e23930f3e9","msgId":"-8772277532478005199","message":"{\"phone\":\"13545228441\",\"dealGroupId\":\"1287039501\",\"dealName\":\"【燃气灶维修】不打火维修电话安装上门维修优惠卷\",\"amount\":\"31.00\",\"firstOrderId\":\"4981005619907623352\",\"firstOrderCode\":\"5831711557\",\"firstOrderActualPrice\":\"30.00\",\"finalOrderId\":\"4981005652342579640\",\"finalOrderCode\":\"8283252725\",\"finalOrderActualPrice\":\"1.00\",\"firstOrderDiscountAmount\":\"0.00\",\"finalOrderDiscountAmount\":\"0.00\",\"dealUnitAmount\":\"30.00\",\"firstOrderPrice\":\"30.00\",\"finalOrderPrice\":\"1.00\"}","timestamp":"1741600287"}
         Log::write('加价尾单核销通知:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
@@ -411,6 +422,7 @@ class MeiTuanNotifyController extends BaseApiController
 
     public function bookresultcallback()
     {
+        return '';
         $a = ThirdOrderLogic::bookresultcallback('AE7MKOJAV67338LIC3UD0K5TGIO','63950625',2);
         dd($a);
     }
@@ -423,6 +435,7 @@ class MeiTuanNotifyController extends BaseApiController
      */
     public function changeresultcallback()
     {
+        return '';
         //changeresultcallback-$shop_token2
         $a = ThirdOrderLogic::changeresultcallback('64201808');
         dd($a);

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

@@ -39,7 +39,12 @@ 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){
+            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'],
+                ]));
                 $meituan_result = ThirdOrderLogic::updateorderfulfillinfo($work,ThirdTypeEnum::MEITUAN_ARRIVED);
                 Log::write('美团确认上门'.json_encode($meituan_result));
             }

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

@@ -404,6 +404,7 @@ class ThirdOrderLogic extends BaseLogic
      */
     public static function bookresultcallback($opBizCode,$orderId,$bookStatus=2)
     {
+        return '';
         http_request('https://developer.kyjlkj.com/platf/kaidianbao/reservationSuccessful',http_build_query([$opBizCode,$orderId,$bookStatus]));
         //预订结果,2-预订成功,3-预订失败
         $url = 'https://api-open-cater.meituan.com/ddzh/yuding/bookresultcallback';
@@ -633,7 +634,8 @@ class ThirdOrderLogic extends BaseLogic
      */
     public static function updateorderfulfillinfo($work,$orderFulfillStatus)
     {
-        http_request('https://developer.kyjlkj.com/platf/Kaidianbao/performanceSecurity',http_build_query(['orderFulfillStatus'=>$orderFulfillStatus]));
+        return '';
+        //http_request('https://developer.kyjlkj.com/platf/Kaidianbao/performanceSecurity',http_build_query(['orderFulfillStatus'=>$orderFulfillStatus]));
         $third_order = ThirdOrders::where('work_id',$work['id'])->findOrEmpty();
         if(!$third_order->isEmpty() && !empty($third_order['request_msg'])) {
 //        家政/维修更新顺序:已分配(40001)→ 已到达(40002)→ 履约完成(41001)