|
|
@@ -382,14 +382,14 @@ class Activity extends Base
|
|
|
|
|
|
//当是库存品的时候校验可用库存数，不满足的时候不能添加
|
|
|
if ($is_stock == 1) {
|
|
|
- $usable_stock = Db::name('good_stock')
|
|
|
- ->where(['spuCode' => $good['spuCode'], 'is_del' => 0])
|
|
|
- ->sum('usable_stock');
|
|
|
+// $usable_stock = Db::name('good_stock')
|
|
|
+// ->where(['spuCode' => $good['spuCode'], 'is_del' => 0])
|
|
|
+// ->sum('usable_stock');
|
|
|
|
|
|
- if ($value['activity_stock'] > $usable_stock) {
|
|
|
+ if ($value['activity_stock'] > $good['usable_stock']) {
|
|
|
Db::rollback();
|
|
|
// throw new \Exception($lemp['good_name'] . '的库存只有' . $usable_stock);
|
|
|
- return app_show(1005,'库存不足',[$lemp['good_name']. '的库存只有' . $usable_stock]);
|
|
|
+ return app_show(1005,'库存不足',[$lemp['good_name']. '的库存只有' . $good['usable_stock']]);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -698,11 +698,9 @@ class Activity extends Base
|
|
|
if(!empty($good)){
|
|
|
foreach ($good as $value){
|
|
|
$temp=[];
|
|
|
- $stock =Db::name("good_stock")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->sum('usable_stock');
|
|
|
|
|
|
//如果是非库存商品，库存数改为最大(即将库存设为无限)
|
|
|
- $temp['stock_num'] = $value['is_stock'] == 1 ? intval($stock) : 9999;
|
|
|
-
|
|
|
+ $temp['stock_num'] = $value['is_stock'] == 1 ? intval($value['usable_stock']) : 9999;
|
|
|
$temp['skuCode']=$value['skuCode'];
|
|
|
$temp['spuCode']=$value['spuCode'];
|
|
|
$temp['is_stock']=$value['is_stock'];
|
|
|
@@ -750,8 +748,8 @@ class Activity extends Base
|
|
|
return error_show(1005,"商品信息不存在或已下架");
|
|
|
}
|
|
|
if($good['is_stock']==1){
|
|
|
- $stock =Db::name("good_stock")->where(["spuCode"=>$good['spuCode'],"is_del"=>0])->sum('usable_stock');
|
|
|
- if($act_stock+$goodinfo['activity_stock']> $stock){
|
|
|
+// $stock =Db::name("good_stock")->where(["spuCode"=>$good['spuCode'],"is_del"=>0])->sum('usable_stock');
|
|
|
+ if($act_stock+$goodinfo['activity_stock']> $good['usable_stock']){
|
|
|
return error_show(1005,"商品库存不足");
|
|
|
}
|
|
|
}
|
