快递

app-hd/controllers/GhsController.php

@@ -257,7 +257,7 @@ class GhsController extends BaseController
         $ghsInfo['packCost'] = $ghsShop->packCost ? floatval($ghsShop->packCost) : 0;
         $lackExpend = $ghsShop->lackExpend ? floatval($ghsShop->lackExpend) : 0;
         $customId = $ghsInfo['customId'] ?? 0;
-        $needAdd = \bizHd\shop\classes\ShopClass::needAddPackCost($ghsShop, $customId);
+        $needAdd = \bizHd\shop\classes\ShopClass::needAddPackCost($ghsShop, $customId, 4);
         //昆明批发，需要算打包费和运费
         $needAddPackFreight = 1;
         if (!$needAdd) {
@@ -323,7 +323,7 @@ class GhsController extends BaseController
 
         //是否使用新的配送方式，关键词 sh_method_area
         $newShMethod = dict::getDict('newShMethod');
-        $ghsInfo['useNewShMethod'] = in_array($ghsShopId, $newShMethod)? 1 : 0 ;
+        $ghsInfo['useNewShMethod'] = in_array($ghsShopId, $newShMethod) ? 1 : 0;
 
         util::success($ghsInfo);
     }
@@ -507,10 +507,10 @@ class GhsController extends BaseController
         $get = Yii::$app->request->get();
         $ghsId = intval($get['ghsId'] ?? 0);
         $ghs = GhsClass::getById($ghsId);
-        if(empty($ghs)){
+        if (empty($ghs)) {
             util::fail('没有找到批发店');
         }
-        if($ghs['ownMainId'] != $this->mainId){
+        if ($ghs['ownMainId'] != $this->mainId) {
             util::fail('不是你的批发店');
         }
         $mainId = $ghs['mainId'] ?? 0;