Merge branch 'redesign‌-260706' of git.huaml.com:zhh/huahuibao into redesign‌-260706

app-ghs/controllers/TestController.php

@@ -510,6 +510,7 @@ class TestController extends BaseController
             //['name' => '亳州花鲜谷', 'merchantNo' => '82238105992004A', 'wx' => [908947821, 908946480], 'zfb' => '2088780700742980'],
             //['name' => '福建清流美朵花业', 'merchantNo' => '82239505992002F', 'wx' => [909185571, 2000017120], 'zfb' => '2088780716665741'],
             //['name' => '东莞丰行', 'merchantNo' => '8226020599200RW', 'wx' => [909917474, 909917851], 'zfb' => '2088780774491467'],
+            ['name' => '重庆大金地2', 'merchantNo' => '8226900599201GA', 'wx' => [910648990, 910644127], 'zfb' => '2088780830897617'],
             ['name' => '云南珑松珠海店', 'merchantNo' => '82258505992009Q', 'wx' => [910384498, 910385532], 'zfb' => '2088780804010303'],
             //['name' => '义乌我要花', 'merchantNo' => '82239505992002H', 'wx' => [910330169, 910330807], 'zfb' => '2088780802113602'],
             //['name' => '仁寿花鲜谷', 'merchantNo' => '82266705992003V', 'wx' => [910335651, 910335572], 'zfb' => '2088780803109765'],

app-hd/controllers/PurchaseController.php

@@ -717,8 +717,8 @@ class PurchaseController extends BaseController
                     $itemTotalAmount = $post['itemTotalAmount'] ?? 0;
                     unset($post['itemTotalAmount']);
 
-                    // sendType == 0 或 4 都要收包装费
-                    if (in_array($sendType, [0, 4])) {
+                    // sendType == 4 要收包装费
+                    if ($sendType == 4) {
                         $needAdd = \bizHd\shop\classes\ShopClass::needAddPackCost($ghsShopInfo, $customId, $sendType, $itemTotalAmount);
                         if ($needAdd) {
                             $packCost = $ghsShopInfo->packCost ?? 0;