Merge branch 'dev'

app/common/repositories/store/product/ProductRepository.php

@@ -465,6 +465,7 @@ class ProductRepository extends BaseRepository
                         "share_num"     => 0,
                         "stock_num"     => 0,
                         "shares_num"    => 0,
+                        "is_usable"     => isset($value['is_usable']) ? (int)$value['is_usable'] : 0,
                         'gong_mer_profit' => $value['gong_mer_profit'] ?? 0.00,
                         'gong_market_price' => $value['gong_market_price'] ?? 0.00,
                         'plate_mer_profit' => $value['plate_mer_profit'] ?? 0.00,
@@ -492,6 +493,7 @@ class ProductRepository extends BaseRepository
                         "share_num"     => (isset($value['share_num']) && $value['share_num'] !== '') ? $value['share_num'] : 0,
                         "stock_num"     => (isset($value['stock_num']) && $value['stock_num'] !== '') ? $value['stock_num'] : 0,
                         "shares_num"    => (isset($value['shares_num']) && $value['shares_num'] !== '') ? $value['shares_num'] : 0,
+                        "is_usable"     => isset($value['is_usable']) ? (int)$value['is_usable'] : 0,
                         'gong_mer_profit' => $value['gong_mer_profit'] ?? 0.00,
                         'gong_market_price' => $value['gong_market_price'] ?? 0.00,
                         'plate_mer_profit' => $value['plate_mer_profit'] ?? 0.00,
@@ -1227,7 +1229,8 @@ class ProductRepository extends BaseRepository
                 'volume'   => $value['volume'],
                 'ot_price' => set_price_rtrim($value['ot_price']),
                 'unique'   => $value['unique'],
-                'dacang'   => $value['dacang_price'] ? set_price_rtrim($value['dacang_price']) : 'null'
+                'dacang'   => $value['dacang_price'] ? set_price_rtrim($value['dacang_price']) : 'null',
+                'is_usable' => $value['is_usable'],
             ];
             if ($productType) {
                 $sku[$value['sku']]['stock'] = $value['stock'] - $make->seckillSkuOrderCounut($value['unique']); //获取sku的销量