Merge branch 'master' into dev

app-hd/controllers/ProductController.php

@@ -1001,7 +1001,12 @@ class ProductController extends BaseController
         }
         $ghsInfo = GhsClass::getById($ghsId, true, 'giveLevel');
         $level = isset($ghsInfo->giveLevel) ? $ghsInfo->giveLevel : 1;
-        $list = ProductClass::groupProductInfo([$product], $level);
+
+        $risePercent = $ghsInfo->risePercent ?? 0;
+        $riseRange = $ghsInfo->riseRange ?? 0;
+        $params = ['risePercent' => $risePercent, 'riseRange' => $riseRange];
+
+        $list = ProductClass::groupProductInfo([$product], $level, $params);
         $product = current($list);
 
         $mainId = $product['mainId'] ?? 0;
@@ -1139,4 +1144,4 @@ class ProductController extends BaseController
         }
     }
 
-}
+}

biz-ghs/order/classes/OrderClass.php

@@ -1950,11 +1950,6 @@ class OrderClass extends BaseClass
                 $showPrice = 0;
             }
 
-            //东莞我要花 不带价格
-            if (isset($orderInfo->mainId) && $orderInfo->mainId == 2644) {
-                $showPrice = 0;
-            }
-
             //衡阳昕得鲜花批发，线上下单，不显示价格
             if (isset($orderInfo->mainId) && $orderInfo->mainId == 85744) {
                 if (!empty($orderInfo->customShopAdminId)) {