diff --git a/platform/modules/v1/controllers/ErpController.php b/platform/modules/v1/controllers/ErpController.php
index 4ed9ec5..140ff74 100644
--- a/platform/modules/v1/controllers/ErpController.php
+++ b/platform/modules/v1/controllers/ErpController.php
@@ -57,21 +57,33 @@ class ErpController extends Controller
             $erpData = [];
             $ids = [];
             foreach($productOrders as $k=>$v){
+                // 如果是商城订单
                 if ($v['order_type'] == 2) {
 
                     $erpData[$k]['orderId'] = $v['order_no'];
                     $erpData[$k]['createTime'] = date('Y-m-d H:i:s', $v['created_at']);
-                    $erpData[$k]['userId'] = $v['store']['erp_id'];
+//                    $erpData[$k]['userId'] = $v['store']['erp_id'];
+                    // 商城订单暂时都用11007诊所来接收订单
+                    $erpData[$k]['userId'] = '11007';
                     $erpData[$k]['orderStatus'] = $v['status'];
+                    $erpData[$k]['orderType'] = $v['type'];
                     $erpData[$k]['totalAmount'] = $v['total_pay_price'];
+
                     // $erpData[$k]['deliveryAmount'] = $v['trans_expenses'];
                     if($v['delivery_method'] == 1){ //到店自取
-                        if (!in_array($v['order_type'], [2])) {
-                            $prescriptionContent = Json::decode($v['prescription']['content']);
-                            $erpData[$k]['deliveryName'] = $prescriptionContent['patient']['name']?? '';
-                            $erpData[$k]['deliveryMobile'] = $prescriptionContent['patient']['mobile']?? '';
-                            $erpData[$k]['deliveryAddress'] = $v['store']['position']?? '';
-                        }
+//                        if (!in_array($v['order_type'], [2])) {
+//                            $prescriptionContent = Json::decode($v['prescription']['content']);
+//                            $erpData[$k]['deliveryName'] = $prescriptionContent['patient']['name']?? '';
+//                            $erpData[$k]['deliveryMobile'] = $prescriptionContent['patient']['mobile']?? '';
+//                            $erpData[$k]['deliveryAddress'] = $v['store']['position']?? '';
+//                        } else {
+//                            $erpData[$k]['deliveryName'] = $v['store']['name']?? '';
+//                            $erpData[$k]['deliveryMobile'] = $v['store']['mobile']?? '';
+//                            $erpData[$k]['deliveryAddress'] = $v['store']['position']?? '';
+//                        }
+                        $erpData[$k]['deliveryName'] = $v['store']['name']?? '';
+                        $erpData[$k]['deliveryMobile'] = $v['store']['mobile']?? '';
+                        $erpData[$k]['deliveryAddress'] = $v['store']['position']?? '';
                     } else {//快递到家
                         $erpData[$k]['deliveryName'] = $v['express_name'];
                         $erpData[$k]['deliveryMobile'] = $v['express_mobile'];
@@ -92,9 +104,11 @@ class ErpController extends Controller
 
                     $erpData[$k]['orderItems'] = $orderItems;
                     $ids[]=$v['id'];
-                    ProductOrderLog::saveLog(0,'江奥川ERP拉取西(中成)药订单数据：'. $v['id']. '：'. json_encode($orderItems));
+//                    ProductOrderLog::saveLog(0,'江奥川ERP拉取西(中成)药订单数据：'. $v['id']. '：'. json_encode($orderItems));
+                    ProductOrderLog::saveLog(0,'江奥川ERP拉取西(中成)药订单数据：'. $v['id']);
                 } else {
 
+                    // 如果是处方订单
                     if (!empty($v['prescription'])) {
 
                         // 如果是处方药或者挂号药