零售价和批发价

app-ghs/controllers/ProductController.php

@@ -572,7 +572,7 @@ class ProductController extends BaseController
                 }
                 $price = $product['price'];
                 if (isset($product['skPrice']) == false || is_numeric($product['skPrice']) == false || $product['skPrice'] < 0) {
-                    util::fail('请填写' . $productName . '的散客价');
+                    util::fail('请填写' . $productName . '的零售价');
                 }
                 $skPrice = $product['skPrice'];
 

app-hd/controllers/ProductController.php

@@ -114,7 +114,7 @@ class ProductController extends BaseController
         if ($delStatus != 2) {
             $where['delStatus'] = $delStatus;
         }
-        //散客价
+        //零售价
         $level = 0;
         $data = ProductClass::getAllByCondition($where, ['actualSold' => SORT_DESC, 'inTurn' => SORT_DESC], "*");
         $data = ProductClass::groupProductInfo($data, $level);

biz-ghs/order/classes/StockOutOrderClass.php

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

biz-ghs/product/classes/ProductClass.php

@@ -311,7 +311,7 @@ class ProductClass extends BaseClass
                 $list[$k]['prePrice'] = bcadd($v['price'], $currentAddPrice, 2);
             }
             if (isset($v['discountPrice']) && $v['discountPrice'] > 0) {
-                //改价列表显示的散客价【重要】
+                //改价列表显示的零售价【重要】
                 $currentAddPrice = $v['skMore'] ?? 0;
                 $list[$k]['skPrice'] = bcadd($v['discountPrice'], $currentAddPrice, 2);
             }
@@ -454,7 +454,7 @@ class ProductClass extends BaseClass
             }
 
             if (isset($v['discountPrice']) && $v['discountPrice'] > 0) {
-                //改价列表显示的散客价【重要】
+                //改价列表显示的零售价【重要】
                 $currentAddPrice = $v['skMore'] ?? 0;
                 $list[$k]['skPrice'] = bcadd($v['discountPrice'], $currentAddPrice, 2);
             }
@@ -1323,7 +1323,7 @@ class ProductClass extends BaseClass
             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']);
@@ -1409,7 +1409,7 @@ class ProductClass extends BaseClass
                     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']);
@@ -1688,7 +1688,7 @@ class ProductClass extends BaseClass
             if (empty($price) || $price <= 0) {
                 util::fail('请填写价格');
             }
-            //散客价
+            //零售价
             $skMore = isset($data['skMore']) && $data['skMore'] > 0 ? $data['skMore'] : 5;
 
             $data['skPrice'] = bcadd($price, $skMore, 2);