diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php
index 411bf462..47bd7201 100644
--- a/admin/controllers/receiver/Orders.php
+++ b/admin/controllers/receiver/Orders.php
@@ -811,8 +811,6 @@ class Orders extends HD_Controller
             $data = [
                 'o_id' => $row['id'],
                 'sid' => $sid,
-                'uid' => $p_row['uid'],
-                'entrust_uid' => $p_row['entrust_uid'],
                 'mch_id' => $wx_mchid,
                 'brand_id' => $row['brand_id'],
                 's_id' => $row['s_id'],
@@ -825,6 +823,8 @@ class Orders extends HD_Controller
                 'status' => 0,
                 'c_time' => time()
             ];
+            $p_row['uid'] && $data['uid'] = $p_row['uid'];
+            $p_row['entrust_uid'] && $data['entrust_uid'] = $p_row['entrust_uid'];
             $descrip && $data['descrip'] = $descrip;
             if($type==1){ //定金
                 $data['pid'] = $p_row['id'];
@@ -848,7 +848,6 @@ class Orders extends HD_Controller
                     return $this->show_json(SYS_CODE_FAIL, '请输入正确尾款金额');
                 }
             }elseif($type==5){
-                $data['pid'] = $p_row['id'];
                 $data['status'] = 1;
                 $data['pay_time'] = $pay_time;
             }else{
@@ -858,8 +857,10 @@ class Orders extends HD_Controller
             if (!$res) {
                 return $this->show_json(SYS_CODE_FAIL, '保存失败');
             }
-            $this->load->service('apporder/payment_service', array('app_id' => 1));
-            $result = $this->payment_service->after_pay_liche($sid,$money,'',$pay_time);
+            if($type!=5){
+                $this->load->service('apporder/payment_service', array('app_id' => 1));
+                $result = $this->payment_service->after_pay_liche($sid,$money,'',$pay_time);
+            }
             return $this->show_json(SYS_CODE_SUCCESS, '保存成功');
         }
         $ck_row = $this->order_ckcars_model->get(['o_id'=>$id]);
diff --git a/api/controllers/wxapp/liche/Order.php b/api/controllers/wxapp/liche/Order.php
index 0add19c0..0bfe8234 100644
--- a/api/controllers/wxapp/liche/Order.php
+++ b/api/controllers/wxapp/liche/Order.php
@@ -126,7 +126,8 @@ class Order extends Wxapp{
         $where = [
             "(uid = {$uid} or entrust_uid={$uid})" => null,
             'pid' => 0,
-            'status>=' => 0
+            'status>=' => 0,
+            'type <>' => 5
         ];
         $oid && $where['o_id'] = $oid;
         $total = $this->app_liche_orders_model->count($where);