注册方式调整

biz-ghs/apply/services/ApplyService.php

@@ -27,6 +27,9 @@ class ApplyService extends BaseService
 
         $respond = MerchantService::initGhsBaseInfo($apply, $main, true);
         $shop = $respond['shop'] ?? [];
+        $sj = $respond['sj'] ?? [];
+        $apply['sjId'] = $sj->id ?? 0;
+        $apply['sjName'] = $sj->name ?? '';
 
         $ret = SjService::initHdBaseInfo($apply, $main);
         $shop2 = $ret['shop'] ?? [];

biz-hd/merchant/services/SjService.php

@@ -51,9 +51,16 @@ class SjService extends BaseService
 
         $jsData = $applyData;
         $sjData['style'] = $ptStyle;
-        $sj = self::add($jsData, true);
-        $sjId = $sj->id;
-        $sjName = $sj->name ?? 0;
+
+        if (isset($applyData['sjId'])) {
+            $sjId = $applyData['sjId'] ?? 0;
+            $sjName = $applyData['sjName'] ?? 0;
+        } else {
+            $sj = self::add($jsData, true);
+            $sjId = $sj->id;
+            $sjName = $sj->name ?? 0;
+        }
+
         $mobile = $applyData['mobile'] ?? '';
 
         if (!empty($applyId) && $applyOpen == true) {