运费

app-ghs/controllers/CustomController.php

@@ -46,7 +46,6 @@ class CustomController extends BaseController
 		$customId = $get['id'] ?? 0;
 		$info = CustomService::getCustomInfo($customId);
 		CustomClass::valid($info, $this->sjId);
-		$info['sn'] = 1254358;
 		util::success($info);
 	}
 	

app-ghs/controllers/OrderController.php

@@ -275,7 +275,7 @@ class OrderController extends BaseController
     //运费计算 shish 2021.1.24
     public function actionFreight()
     {
-        util::success(['sndCost' => 20]);
+        util::success(['sedCost' => 20]);
     }
 
     //发快递和第三方配送 shish 2021.1.24

biz-ghs/custom/classes/CustomClass.php

@@ -29,6 +29,13 @@ class CustomClass extends BaseClass
                         'name' => $applyData['name'],
                         'mobile' => $applyData['mobile'],
                         'isOpen' => $isOpen,
+                        'province' => $applyData['province'] ?? '',
+                        'city' => $applyData['city'] ?? '',
+                        'dist' => $applyData['dist'] ?? '',
+                        'address' => $applyData['address'] ?? '',
+                        'fullAddress' => $applyData['fullAddress'],
+                        'long' => $applyData['long'],
+                        'lat' => $applyData['lat'],
                     ];
                     CustomClass::addCustom($customData);
                 }
@@ -51,6 +58,13 @@ class CustomClass extends BaseClass
                         'name' => $name,
                         'mobile' => $mobile,
                         'isOpen' => 1,
+                        'province' => $applyData['province'] ?? '',
+                        'city' => $applyData['city'] ?? '',
+                        'dist' => $applyData['dist'] ?? '',
+                        'address' => $applyData['address'] ?? '',
+                        'fullAddress' => $applyData['fullAddress'],
+                        'long' => $applyData['long'],
+                        'lat' => $applyData['lat'],
                     ];
                     CustomClass::addCustom($customData);
                 }
@@ -99,6 +113,7 @@ class CustomClass extends BaseClass
             $list[$key]['shortAvatar'] = $currentInfo['shortLogoUrl'];
             $list[$key]['visitTime'] = '03-20 12:00';
             $list[$key]['level'] = 0;
+            $list[$key]['sn'] = $val['id'];
         }
         return $list;
     }

biz-hd/saas/services/ApplyService.php

@@ -64,18 +64,16 @@ class ApplyService extends BaseService
         $applyId = $apply['id'];
         ApplyClass::updateById($applyId, ['status' => ApplyClass::STATUS_PASS, 'remark' => $remark]);
 
-        $customId = $apply['customId'];
-        if (!empty($customId)) {
-            //补充营业执照后变更商家信息
-            $respond = MerchantService::certChangeSjInfo($apply);
-        } else {
-            $adminId = $apply['adminId'];
-            $admin = AdminClass::getById($adminId);
-            $apply['merchantName'] = isset($apply['name']) ? $apply['name'] : '';
-            $apply['adminName'] = $admin['adminName'] ?? '';
-            //初始化商家信息
-            $respond = MerchantService::initSjInfo($apply);
-        }
+        //补充营业执照后变更商家信息
+        //$respond = MerchantService::certChangeSjInfo($apply);
+
+        $adminId = $apply['adminId'];
+        $admin = AdminClass::getById($adminId);
+        $apply['merchantName'] = isset($apply['name']) ? $apply['name'] : '';
+        $apply['adminName'] = $admin['adminName'] ?? '';
+        //初始化商家信息
+        $respond = MerchantService::initSjInfo($apply);
+
         return $respond;
     }