MerchantService 的平台类型修正与顺丰凭据切换

biz-ghs/merchant/services/MerchantService.php

@@ -66,7 +66,7 @@ class MerchantService extends BaseService
         $sjId = $sj->id;
         $sjName = $sj->name ?? 0;
         $mobile = $applyData['mobile'] ?? '';
-        $ptStyle = $applyData['style'] ?? dict::getDict('ptStyle', 'hd');
+        $ptStyle = $applyData['style'] ?? dict::getDict('ptStyle', 'ghs');
 
         if (!empty($applyId) && $applyThis) {
             ApplyClass::updateById($applyId, ['sjId' => $sjId]);
@@ -111,10 +111,9 @@ class MerchantService extends BaseService
             'gradeList' => '1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8',//1 级会员需要满 2000 积分 购物享9折；2 级会员需要满 5000 积分 购物享88折
         ];
         MerchantExtendClass::add($extendData);
-
         MerchantInitClass::add(['sjId' => $sjId]);
 
-        //给10天时间
+        //给10天试用时间
         $deadTime = time()+864000;
         //创建门店
         $shopData = [

common/components/delivery/platform/shunfeng/Shunfeng.php

@@ -30,12 +30,12 @@ class Shunfeng
             $this->devId = 1594082399;
             $this->appSecret = '9025c4f5ad93e8e08e947f02d0cde652';
         } else {
-//            $this->baseUrl = 'https://openic.sf-express.com/open/api/external/';
-//            $this->devId = 1741530942;
-//            $this->appSecret = '07b3f83d19a4a9f89322976c936faf92';
-            $this->baseUrl = 'https://openic.sf-express.com/open/api/external/';
-            $this->devId = 1594082399;
-            $this->appSecret = '9025c4f5ad93e8e08e947f02d0cde652';
+           $this->baseUrl = 'https://openic.sf-express.com/open/api/external/';
+           $this->devId = 1741530942;
+           $this->appSecret = '07b3f83d19a4a9f89322976c936faf92';
+            // $this->baseUrl = 'https://openic.sf-express.com/open/api/external/';
+            // $this->devId = 1594082399;
+            // $this->appSecret = '9025c4f5ad93e8e08e947f02d0cde652';
         }
         $this->shopId = $shopId;