|
@@ -1222,7 +1222,7 @@ class WholeController extends Curd
|
|
|
if (isset($skuStorageJson['storage']) && !empty($skuStorageJson['storage'])){
|
|
|
$skuStorageJson['storage'] = $skuStorageJson['storage'] - $goods['nbr'];
|
|
|
}
|
|
|
- if (!isset($skuStorageJson['storage']) || (!empty($skuStorageJson['storage'] && $skuStorageJson['storage'] < 0))){
|
|
|
+ if (!isset($skuStorageJson['storage']) || (!empty($skuStorageJson['storage']) && $skuStorageJson['storage'] < 0)){
|
|
|
throw new BusinessException('库存不足');
|
|
|
}
|
|
|
}
|
|
@@ -1820,11 +1820,11 @@ class WholeController extends Curd
|
|
|
if (!isset($params['submit_goods_classify']) || $params['submit_goods_classify'] != 'MEALS'){
|
|
|
$goodsSku = GoodsSku::where('goods_sku_id',$goods['sku_id'])->first();
|
|
|
$skuStorageJson = json_decode($goodsSku->goods_sku_storage_json,true);
|
|
|
- if (isset($skuStorageJson['storage'])){
|
|
|
+ if (isset($skuStorageJson['storage']) && !empty($skuStorageJson['storage'])){
|
|
|
$skuStorageJson['storage'] = $skuStorageJson['storage'] - $goods['nbr'];
|
|
|
}
|
|
|
|
|
|
- if (!isset($skuStorageJson['storage']) || $skuStorageJson['storage'] < 0){
|
|
|
+ if (!isset($skuStorageJson['storage']) || (!empty($skuStorageJson['storage']) && $skuStorageJson['storage'] < 0)){
|
|
|
throw new BusinessException('库存不足');
|
|
|
}
|
|
|
$goodsSku->goods_sku_storage_json = json_encode($skuStorageJson);
|