去掉了商品的初始化

biz-hd/goods/classes/CategoryClass.php

@@ -67,41 +67,20 @@ class CategoryClass extends BaseClass
     //开店初始化分类和商品 ssh 2020.2.14
     public static function initCategoryGoods($mainId)
     {
-        $date = date("Y-m-d H:i:s");
-        $list = [
-            '花束' => [
-                ['mainId' => $mainId, 'shopImg' => '["uploads\/201906\/23\/jpg\/19062359040_12358.jpg","uploads\/201906\/23\/jpg\/19062381985_12358.jpg"]', 'price' => 588, 'content' => '暂无简介', 'createTime' => $date, 'updateTime' => $date, 'name' => '相思', 'itemNumber' => stringUtil::buildRandNo($mainId) . '5',],
-                ['mainId' => $mainId, 'shopImg' => '["uploads\/201906\/23\/jpg\/19062352536_12358.jpg","uploads\/201906\/23\/jpg\/19062331132_12358.jpg","uploads\/201906\/23\/jpg\/19062380371_12358.jpg"]', 'price' => 688, 'content' => '暂无简介', 'createTime' => $date, 'updateTime' => $date, 'name' => '女神', 'itemNumber' => stringUtil::buildRandNo($mainId) . '6',],
-            ],
-            '花篮' => [
-                ['mainId' => $mainId, 'shopImg' => '["uploads\/201906\/23\/jpg\/19062380217_12358.jpg","uploads\/201906\/23\/jpg\/19062339442_12358.jpg","uploads\/201906\/23\/jpg\/19062382963_12358.jpg"]', 'price' => 388, 'content' => '暂无简介', 'createTime' => $date, 'updateTime' => $date, 'name' => '只此一心', 'itemNumber' => stringUtil::buildRandNo($mainId) . '3',],
-                ['mainId' => $mainId, 'shopImg' => '["uploads\/201906\/23\/jpg\/19062374848_12358.jpg","uploads\/201906\/23\/jpg\/19062372687_12358.jpg","uploads\/201906\/23\/jpg\/19062341158_12358.jpg"]', 'price' => 488, 'content' => '暂无简介', 'createTime' => $date, 'updateTime' => $date, 'name' => '密语时光', 'itemNumber' => stringUtil::buildRandNo($mainId) . '4',],
-            ],
-            '永生花' => [],
-            '绿植' => []
-        ];
-        foreach ($list as $key => $goodsList) {
-            $data = ['categoryName' => $key, 'mainId' => $mainId, 'status' => 1];
-            $cat = self::add($data);
-            if (!empty($goodsList)) {
-                $categoryId = $cat['id'];
-                foreach ($goodsList as $key => $val) {
-                    $goods = GoodsClass::add($val);
-                    $goodsId = $goods['id'];
-                    $goodsCategoryData = ['cId' => $categoryId, 'gId' => $goodsId, 'mainId' => $mainId];
-                    GoodsCategoryClass::add($goodsCategoryData);
-                }
-            }
+        $catList = [['name' => '花束', 'flower' => 1], ['name' => '花篮', 'flower' => 1], ['name' => '永生花', 'flower' => 0], ['name' => '绿植', 'flower' => 0]];
+        foreach ($catList as $key => $cat) {
+            $name = $cat['name'] ?? '';
+            $flower = $cat['flower'];
+            $data = ['categoryName' => $name, 'mainId' => $mainId, 'flower' => $flower, 'status' => 1];
+            self::add($data);
         }
     }
 
     //删除分类 ssh 2020.3.3
     public static function deleteCategory($id)
     {
-        return self::updateByCondition([
-            'id' => $id,
-            'goodsNum' => 0
-        ], ['delStatus' => 1]);
+        return self::updateByCondition(['id' => $id, 'goodsNum' => 0], ['delStatus' => 1]);
         return true;
     }
+
 }

biz-hd/goods/classes/GoodsClass.php

@@ -376,18 +376,17 @@ class GoodsClass extends BaseClass
     }
 
     //验证商品的有效性 ssh 20201.2.1
-    public static function valid($goods, $sjId)
+    public static function valid($goods, $mainId)
     {
         if (empty($goods)) {
             util::fail('没有找到商品');
         }
-        if (isset($goods['sjId']) && $goods['sjId'] == $sjId) {
+        if (isset($goods['mainId']) && $goods['mainId'] == $mainId) {
             return true;
         }
         util::fail('此商品您没有权限查看哦');
     }
 
-
     //库存变动入口
     //加库存
     public static function addStock($goodsId, $mainId, $num)

sql.sql

@@ -998,4 +998,4 @@ ALTER TABLE xhMain ADD `unPayOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '待付
 ALTER TABLE xhMain ADD `unSendOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '待配送订单数' AFTER `unPayOrder`;
 ALTER TABLE xhMain ADD `sendingOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '配送中订单数' AFTER `unSendOrder`;
 ALTER TABLE xhMain ADD `cancelOrder` INT(11) NOT NULL DEFAULT '0' COMMENT '已取消订单数' AFTER `sendingOrder`;
--- ssh 20220424
+ALTER TABLE xhGoods ADD `stockSet` TINYINT NOT NULL DEFAULT 1 COMMENT '库存不足时 0不能下单 1可以下单' AFTER `stock`;