diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php
index af33753..a3b90a9 100644
--- a/app/Services/OrderService.php
+++ b/app/Services/OrderService.php
@@ -8,6 +8,7 @@ use App\Models\Dma\S2Customer;
 use App\Models\Order;
 use App\Models\PayOrder;
 use App\Models\RankHistory;
+use App\Models\Server\MerchantUser;
 use App\Models\User;
 use App\Models\Score;
 use App\Models\ScoreHistory;
@@ -632,32 +633,29 @@ class OrderService implements OrderContract
             }
 
             // 查询订单用户手机号和分享人用户手机号
-            $wechat = Wechat::where("official_openid", $order->open_id)->first();
-            if (empty($wechat)) {
-                Log::error("没有下单人wechat");
+            $merchant_user = MerchantUser::where("openid", $order->open_id)->first();
+            if (empty($merchant_ser)) {
+                Log::error("没有下单人merchant_user");
                 return false;
             }
-            $from_wechat = Wechat::where("official_openid", $order->from_openid)->first();
-            if (empty($from_wechat)) {
-                Log::error("没有分享人wechat");
+            $from_merchant_user = MerchantUser::where("openid", $order->from_openid)->first();
+            if (empty($from_merchant_user)) {
+                Log::error("没有分享人from_merchant_user");
                 return false;
             }
-            $user = User::Where("id", $wechat->user_id)->first();
-            if (empty($user)) {
-                Log::error("没有下单人user");
-                return false;
+
+            // 用户手机号 优先从订单获取  然后从账号获取
+            $mobile = $order->mobile;
+            if (empty($mobile)) {
+                $mobile = $merchant_user->mobile;
             }
-            $from_user = User::Where("id", $from_wechat->user_id)->first();
-            if (empty($from_user)) {
-                Log::error("没有分享人user");
-                return false;
-            }
-            $mobile = $user->mobile;
             if (empty($mobile)) {
                 Log::error("没有下单人手机号");
                 return false;
             }
-            $from_mobile = $from_user->mobile;
+
+
+            $from_mobile = $from_merchant_user->mobile;
             if (empty($from_mobile)) {
                 Log::error("没有分享人手机号");
                 return false;
@@ -680,9 +678,9 @@ class OrderService implements OrderContract
             // 创建客户
             S2Customer::create([
                 "user_id" => $serviceUser->user_id,
-                "customer_name" => "",
+                "customer_name" => $merchant_user->nickname,
                 "customer_type" => 101,
-                "contacts_name" => $user->nickname,
+                "contacts_name" => $merchant_user->nickname,
                 "contacts_mobile" => $mobile,
                 "intention" => 1,
                 "status" => 2