Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

biz-ghs/product/classes/ProductClass.php

@@ -847,6 +847,9 @@ class ProductClass extends BaseClass
         if (!empty($productList)) {
             foreach ($productList as $product) {
                 if (isset($product['mainId']) == false || $product['mainId'] != $mainId) {
+                    $name = $product['name'] ?? '';
+                    $pMainId = $product['mainId'] ?? 0;
+                    noticeUtil::push("只能选择同一家的商品哦！{$name} {$pMainId} {$mainId}", '15280215347');
                     util::fail('只能选择同一家的商品哦');
                 }
             }