Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Activity.php

@@ -281,6 +281,16 @@ class Activity extends Base
                         $lemp['addtime']=date("Y-m-d H:i:s");
                         $lemp['updatetime']=date("Y-m-d H:i:s");
                         $temp[]=$lemp;
+
+                        //当是库存品的时候校验可用库存数，不满足的时候不能添加
+                        if ($is_stock == 1) {
+                            $usable_stock = Db::name('good_stock')
+                                ->where(['spuCode' => $good['spuCode'], 'is_del' => 0])
+                                ->sum('usable_stock');
+
+                            if ($value['activity_stock'] < $usable_stock) throw new \Exception($lemp['good_name'] . '的库存只有' . $usable_stock);
+                        }
+
                     }
                     $iall=Db::name("activity_info")->insertAll($temp);
                     if($iall==0){