花材比例兼容

biz-ghs/order/classes/StockOutOrderClass.php

@@ -111,6 +111,7 @@ class StockOutOrderClass extends BaseClass
             $transaction->commit();
         }catch (\Exception $exception){
             $transaction->rollBack();
+            Yii::warning("stock out :".$exception->getMessage());
             util::fail("操作失败");
         }
 

biz-ghs/product/classes/ProductClass.php

@@ -47,7 +47,7 @@ class ProductClass extends BaseClass
                     //没有图片时取默认图片 ssh 2021.2.18
                     $cover = imgUtil::getPrefix() . '/hhb_small.png';
                 }
-                $unitNum = $data[$v['itemId']]['unitNum'] ?? 0;
+                $unitNum = $data[$v['itemId']]['ratio'] ?? 0;
                 $stockInfo = self::formatStock($v['stock'], $unitNum);
                 $list[$k]['cover'] = $cover;
                 $list[$k]['bigNum'] = $stockInfo['bigNum'];

biz-ghs/stock/classes/StockRecordClass.php

@@ -68,7 +68,8 @@ class StockRecordClass extends BaseClass
             $itemId = $v['itemId'];
             $productId = $v['productId'];
             $record = [];
-            $itemNum = ProductClass::mergeItemNumByItemId($v['bigNum'],$v['smallNum'],$itemId);
+            $unitNum = $productData[$productId]['ratio']??0;
+            $itemNum = ProductClass::mergeItemNum($v['bigNum'],$v['smallNum'],$unitNum);
             $record['merchantId'] = $orderData['merchantId'];
             $record['shopId'] = $orderData['shopId'];
             $record['orderSn'] = $orderData['orderSn'];

common/services/xhItemService.php

@@ -29,7 +29,7 @@ class xhItemService
 	public static function getItemUnitNum($id)
 	{
 		$itemData = self::getById($id);
-		$unitNum = $itemData['unitNum'];
+		$unitNum = $itemData['ratio'];
 		return $unitNum;
 	}
 
@@ -40,7 +40,7 @@ class xhItemService
 		$data = [];
 		if ($itemDatas) {
 			foreach ($itemDatas as $v) {
-				$data[$v['id']] = $v['unitNum'];
+				$data[$v['id']] = $v['ratio'];
 			}
 		}
 		return $data;