Sfoglia il codice sorgente

add - 工单详情新增:用户发券/加单操作

liugc 11 mesi fa
parent
commit
56b49c5d2b

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

@@ -162,9 +162,6 @@ class ServiceWorkController extends BaseAdminController
                     ]
                 ]);
             }
-
-            //判断是否是美团订单,如果是,则取消美团订单
-            ThirdOrderLogic::merchantcancelorder($params['id']);
             return $this->success('取消工单成功!', [], 1, 1);
         }
 

+ 2 - 3
app/adminapi/logic/works/ServiceWorkLogic.php

@@ -842,14 +842,13 @@ class ServiceWorkLogic extends BaseLogic
 
             ServiceWork::where('id', $params['id'])->update([
                 'work_status' => 9,
-                'service_status' => 4,
-                'remark' => $params['remark']??''
+                'service_status' => 4
             ]);
 
             ServiceWorkLog::create([
                 'work_id' => $params['id'],
                 'master_worker_id' => $serviceWorkInfo['master_worker_id'],
-                'opera_log' => "工单:{$serviceWorkInfo['work_sn']}已取消"
+                'opera_log' => "工单:{$serviceWorkInfo['work_sn']}已取消".($params['remark']??'')
             ]);
 
             Db::commit();