Merge branch 'dev' of e.coding.net:zdap/weixiu/weixiu_api into dev

app/api/logic/ServiceOrderLogic.php

@@ -1103,7 +1103,7 @@ class ServiceOrderLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            $order = RechargeOrder::where(['id'=>$params['order_id'],'user_id'=>$params['user_id']])->findOrEmpty();
+            $order = RechargeOrder::where(['sn'=>$params['sn'],'user_id'=>$params['user_id']])->findOrEmpty();
             if($order->isEmpty()){
                 throw new Exception('订单不存在');
             }

app/api/validate/ServiceOrderValidate.php

@@ -117,7 +117,7 @@ class ServiceOrderValidate extends BaseValidate
 
     public function sceneBindWorkerAndWork()
     {
-        return $this->only(['order_id','worker_id']);
+        return $this->only(['sn','worker_id']);
     }
 
 }