批发价

app-ghs/controllers/ItemController.php

@@ -390,19 +390,19 @@ class ItemController extends BaseController
                 $skPrice = is_numeric($v['skPrice']) ? $v['skPrice'] : 0;
                 $cost = is_numeric($v['cost']) ? $v['cost'] : 0;
                 if ($price <= 0) {
-                    util::fail("请填写{$name}的花店价");
+                    util::fail("请填写{$name}的批发价");
                 }
                 if ($skPrice <= 0) {
-                    util::fail("请填写{$name}的个人价");
+                    util::fail("请填写{$name}的零售价");
                 }
                 if ($cost <= 0) {
                     util::fail("请填写{$name}的成本价");
                 }
                 if ($price > $skPrice) {
-                    util::fail("{$name}的花店价比个人价还高");
+                    util::fail("{$name}的批发价比零售价还高");
                 }
                 if ($cost > $price) {
-                    util::fail("{$name}的成本价比花店价还高");
+                    util::fail("{$name}的成本价比批发价还高");
                 }
                 $skMore = bcsub($skPrice, $price, 2);
                 $addPrice = bcsub($price, $cost, 2);

app-ghs/controllers/ProductController.php

@@ -415,7 +415,7 @@ class ProductController extends BaseController
             }
         }
 
-        //输出标准会员价，即花店价，默认显示的是花店价
+        //输出标准会员价，即批发价，默认显示的是批发价
         $level = 1;
 
         $type = Yii::$app->request->get('type', '');
@@ -484,7 +484,7 @@ class ProductController extends BaseController
         if ($delStatus != 2) {
             $where['delStatus'] = $delStatus;
         }
-        //输出标准会员价，即花店价，默认显示的是花店价
+        //输出标准会员价，即批发价，默认显示的是批发价
         $level = 1;
         $data = ProductClass::getAllByCondition($where, ['actualSold' => SORT_DESC, 'inTurn' => SORT_DESC], "*");
         $data = ProductClass::groupProductInfo($data, $level);
@@ -568,7 +568,7 @@ class ProductController extends BaseController
                     util::fail('没有花材');
                 }
                 if (isset($product['price']) == false || is_numeric($product['price']) == false || $product['price'] < 0) {
-                    util::fail('请填写' . $productName . '的花店价');
+                    util::fail('请填写' . $productName . '的批发价');
                 }
                 $price = $product['price'];
                 if (isset($product['skPrice']) == false || is_numeric($product['skPrice']) == false || $product['skPrice'] < 0) {

biz-ghs/order/classes/OrderClass.php

@@ -749,7 +749,7 @@ class OrderClass extends BaseClass
             $productInfo = ProductClass::getByIds($ids, null, 'id');
             foreach ($list as $key => $val) {
                 $productId = $val['productId'] ?? 0;
-                //当前花材的花店价
+                //当前花材的批发价
                 $currentPrice = $productInfo[$productId]['price'] ?? 0;
                 $list[$key]['currentHdPrice'] = floatval($currentPrice);
                 $list[$key]['property'] = '';

biz-ghs/order/classes/StockOutOrderClass.php

@@ -253,7 +253,7 @@ class StockOutOrderClass extends BaseClass
             $tmp['newStock'] = $v['newStock'];//当时库存
             $tmp['itemNum'] = ProductClass::mergeItemNum($v['bigNum'], $v['smallNum'], $unitNum);// 数量
             $tmp['itemPrice'] = $productData[$productId]['cost'] ?? 0; //当时成本价
-            $tmp['price'] = $productData[$productId]['price'] ?? 0; //当时花店价
+            $tmp['price'] = $productData[$productId]['price'] ?? 0; //当时批发价
             $tmp['skPrice'] = $productData[$productId]['skPrice'] ?? 0; //当时散客价
             $stockFormat = ProductClass::formatStock($tmp['itemStock'], $unitNum); // 库存总单位数量转大小单位的数量
             $itemInfo = [

biz-ghs/product/classes/ProductClass.php

@@ -1319,11 +1319,11 @@ class ProductClass extends BaseClass
         $changeParams = ['staffId' => $staffId, 'staffName' => $staffName];
 
         if ($price != $product->price) {
-            //花店价有变化
+            //批发价有变化
             self::changeSinglePrice($shop, $ptItemId, $price, $currentSkPrice, $changeParams);
             unset($upData['price']);
         } else {
-            //花店价没有变化，但散客价比花店价贵多少有修改时，也要改价
+            //批发价没有变化，但散客价比批发价贵多少有修改时，也要改价
             if (isset($data['skMore']) && is_numeric($data['skMore']) && $data['skMore'] != $product->skMore) {
                 self::changeSinglePrice($shop, $ptItemId, $price, $currentSkPrice, $changeParams);
                 unset($upData['price']);
@@ -1405,11 +1405,11 @@ class ProductClass extends BaseClass
                 }
 
                 if ($price != $chainProduct->price) {
-                    //花店价有变化
+                    //批发价有变化
                     self::changeSinglePrice($chainShop, $ptItemId, $price, $currentSkPrice, $changeParams2);
                     unset($params['price']);
                 } else {
-                    //花店价没有变化，但散客价比花店价贵多少有修改时，也要改价
+                    //批发价没有变化，但散客价比批发价贵多少有修改时，也要改价
                     if (isset($data['skMore']) && is_numeric($data['skMore']) && $data['skMore'] != $chainProduct->skMore) {
                         self::changeSinglePrice($chainShop, $ptItemId, $price, $currentSkPrice, $changeParams2);
                         unset($params['price']);
@@ -1680,10 +1680,10 @@ class ProductClass extends BaseClass
             $ptItemInfo = PtItemClass::getById($ptItemId, true);
             $data['variety'] = $ptItemInfo->variety ?? 0;
 
-            //花店价比进货价贵多少 2021-12-07 lqh 如果前端有传取前端的，没有则取pt
+            //批发价比进货价贵多少 2021-12-07 lqh 如果前端有传取前端的，没有则取pt
             $addPrice = $data['addPrice'] ?? $ptItemInfo->addPrice;
             $data['addPrice'] = $addPrice;
-            //花店价
+            //批发价
             $price = $data['price'] ?? 0;
             if (empty($price) || $price <= 0) {
                 util::fail('请填写价格');

console/controllers/ProductController.php

@@ -57,7 +57,7 @@ class ProductController extends Controller
 
     }
 
-    //修改散客比花店价格贵 ssh 20220609
+    //修改散客比批发价格贵 ssh 20220609
     public function actionSkMore()
     {
         $query = new \yii\db\Query();