Merge branch 'dev-xpy' into dev

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

@@ -1229,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的销量