更新

app-ghs/controllers/OrderController.php

@@ -1398,7 +1398,7 @@ class OrderController extends BaseController
         //判断花材有效性
         foreach ($itemInfo as $itemData) {
             if (!isset($itemData['mainId']) || $itemData['mainId'] != $this->mainId) {
-                util::fail('只能选择同一家的商品哈');
+                util::fail('只能选一家的商品哈，请清空重选');
             }
         }
 

app-hd/controllers/PurchaseController.php

@@ -181,7 +181,7 @@ class PurchaseController extends BaseController
             if (!empty($productInfoList)) {
                 foreach ($productInfoList as $currentInfo) {
                     if (isset($currentInfo['mainId']) == false || $currentInfo['mainId'] != $this->mainId) {
-                        util::fail('只能选择同一家的商品哦');
+                        util::fail('只能选一家的商品，请清空重选。');
                     }
                 }
                 if (count($productInfoList) != count($ids)) {
@@ -386,7 +386,7 @@ class PurchaseController extends BaseController
                 $nowTime = strtotime(date("Y-m-d"));
                 foreach ($productInfoList as $currentInfo) {
                     if (!isset($currentInfo['mainId']) || $currentInfo['mainId'] != $ghsMainId) {
-                        util::fail('只能选择同一家的商品哦');
+                        util::fail('只能选一家的商品，请清空重新选。');
                     }
                     $currentName = $currentInfo['name'] ?? '';
                     if (isset($currentInfo['frontHide']) && $currentInfo['frontHide'] == 1) {

app-mall/controllers/OrderController.php

@@ -261,7 +261,7 @@ class OrderController extends BaseController
             $nowTime = strtotime(date("Y-m-d"));
             foreach ($productInfoList as $currentInfo) {
                 if (!isset($currentInfo['mainId']) || $currentInfo['mainId'] != $this->mainId) {
-                    util::fail('只能选择同一家的商品哦');
+                    util::fail('只能选一家的商品，请清空重新选呢');
                 }
                 $presell = $currentInfo['presell'] ?? 0;
                 $presellData[] = $presell;
@@ -1319,4 +1319,4 @@ class OrderController extends BaseController
         util::success($detail);
     }
 
-}
+}

biz-ghs/product/classes/ProductClass.php

@@ -1343,7 +1343,7 @@ class ProductClass extends BaseClass
                     $name = $product['name'] ?? '';
                     $pMainId = $product['mainId'] ?? 0;
                     //noticeUtil::push("只能选择同一家的商品哦！{$name} {$pMainId} {$mainId}", '15280215347');
-                    util::fail($name . ' 不是同家的商品，请清空重选');
+                    util::fail($name . ' 不是一家的商品，请清空重选');
                 }
             }
             if (count($productList) != count($ids)) {