Merge branch 'master' into dev

app-hd/controllers/ShopController.php

@@ -58,6 +58,7 @@ class ShopController extends BaseController
         $fullName = $shop->shopName == '首店' ? $name : $name . ' ' . $shop->shopName;
         $shopId = $shop->id;
         HdClass::updateByCondition(['shopId' => $shopId], ['name' => $fullName]);
+        CustomClass::updateByCondition(['shopId' => $shopId], ['originName' => $fullName]);
         util::complete('修改成功');
     }
 

biz-hd/purchase/classes/PurchaseClass.php

@@ -449,6 +449,9 @@ class PurchaseClass extends BaseClass
             'cargo_num' => $packageNum
         ];
         $customName = $custom->name ?? '';
+        if (empty($customName)) {
+            util::fail('客户名称是空的');
+        }
         $customMobile = $custom->mobile ?? '';
         if (empty($customMobile)) {
             util::fail('客户手机缺失');

biz/shop/classes/ShopClass.php

@@ -37,7 +37,7 @@ class ShopClass extends BaseClass
         $address = $shop->address ?? '';
         $hasMap = dict::getDict('hasMap');
         if (getenv('YII_ENV') == 'production') {
-            $openIntraCityMainList = [50, 58668];
+            $openIntraCityMainList = [50, 58668, 24162];
         } else {
             $openIntraCityMainList = [644];
         }

common/components/IntraCityExpress.php

@@ -332,12 +332,15 @@ class IntraCityExpress
      */
     public static function preAddOrder($orderData, $merchant = null, $ptStyle = 0)
     {
-        // 创建表单验证模型
-        $form = new StoreFeeForm();
-        $form->setScenario('query_fee');
-        $form->load($orderData, ''); // 直接从 post 数据加载，不使用模型名作为前缀
-        // 执行表单验证
-        $form->validateForm();
+
+        // 花好鲜鲜花批发（安海部） user_name会被阻挡，不要打开
+
+//        // 创建表单验证模型
+//        $form = new StoreFeeForm();
+//        $form->setScenario('query_fee');
+//        $form->load($orderData, ''); // 直接从 post 数据加载，不使用模型名作为前缀
+//        // 执行表单验证
+//        $form->validateForm();
 
         if ($merchant === null) {
             $merchant = self::getMerchant();