Merge branch 'master' of git.huaml.com:zhh/huahuibao

app-hd/controllers/MainController.php

@@ -60,23 +60,6 @@ class MainController extends BaseController
         return $this->renderPartial('demo');
     }
 
-    //首页 ssh 2019.12.2
-    public function actionIndex()
-    {
-        $where = ['mainId' => $this->mainId, 'type' => 0, 'status' => 1, 'delStatus' => 0];
-        $adRespond = AdService::getAdList($where);
-        $ad = [];
-        if (isset($adRespond['list']) && !empty($adRespond['list'])) {
-            foreach ($adRespond['list'] as $single) {
-                $ad[] = ['adImg' => $single['adImgUrl'], 'url' => ''];
-            }
-        }
-        $category = CategoryService::getTopThreeCategory($this->mainId);
-        $categoryList = !empty($category) ? GoodsCategoryService::getAppointCategoryList($category) : [];
-        $data = ['ad' => $ad, 'category' => $categoryList, 'columnStyle' => rand(1, 2)];
-        util::success($data);
-    }
-
     //新客户 ssh 2019.12.29
     public function actionVisit()
     {

app-hd/controllers/WorkController.php

@@ -187,7 +187,10 @@ class WorkController extends BaseController
             WorkClass::finish($work);
             $transaction->commit();
 
-            WorkClass::print($work, $this->shop, false);
+            if (isset($work->orderSn) == false || empty($work->orderSn)) {
+                //没有订单的制作单完成时打印
+                WorkClass::print($work, $this->shop, false);
+            }
 
             util::complete();
         } catch (\Exception $e) {

app-mall/controllers/CategoryController.php

@@ -29,6 +29,15 @@ class CategoryController extends BaseController
         $where['mainId'] = $this->mainId;
         $where['cId'] = $categoryId;
         $where['delStatus'] = 0;
+        $where['status'] = 1;
+
+        $shop = $this->shop;
+        $stockModel = $shop->stockModel ?? 0;
+        if ($stockModel == 1) {
+            //管到支的，查看所有上架并且花材数量设置好的商品
+            $where['setItemNum'] = 1;
+        }
+
         $data = GoodsCategoryService::getGoodsList($where);
         util::success($data);
     }

app-mall/controllers/MainController.php

@@ -21,8 +21,9 @@ class MainController extends BaseController
                 $ad[] = ['adImg' => $single['adImgUrl'], 'url' => ''];
             }
         }
+        $shop = $this->shop;
         $category = CategoryService::getTopThreeCategory($this->mainId);
-        $categoryList = !empty($category) ? GoodsCategoryService::getAppointCategoryList($category) : [];
+        $categoryList = !empty($category) ? GoodsCategoryService::getAppointCategoryList($category, $shop) : [];
         $sj = $this->sj->attributes;
         $data = [
             'ad' => $ad,

biz-hd/goods/classes/GoodsClass.php

@@ -275,6 +275,9 @@ class GoodsClass extends BaseClass
         $mainId = $data['mainId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
         $flower = $data['flower'] ?? 0;
+        $status = $data['status'] ?? 0;
+        $delStatus = $data['delStatus'] ?? 0;
+        $setItemNum = $data['setItemNum'] ?? 0;
         $categoryData = CategoryClass::getCategory($mainId);
         $catIds = $data['catIds'] ?? [];
         foreach ($catIds as $catId) {
@@ -290,6 +293,9 @@ class GoodsClass extends BaseClass
                 'flower' => $flower,
                 'flowerNum' => $flowerNum,
                 'sn' => $sn,
+                'status' => $status,
+                'delStatus' => $delStatus,
+                'setItemNum' => $setItemNum,
             ];
             GoodsCategoryClass::add($addCategory);
             CategoryClass::counters(['goodsNum' => 1], ['id' => $catId]);
@@ -365,7 +371,7 @@ class GoodsClass extends BaseClass
     public static function updateGoods($info, $data)
     {
         $id = $info['id'] ?? 0;
-        $setItemNum = $info['setItemNum'] ?? 0;
+        $preSetItemNum = $info['setItemNum'] ?? 0;
 
         $categoryIdList = isset($data['categoryIdList']) && !empty($data['categoryIdList']) ? $data['categoryIdList'] : [];
         unset($data['categoryIdList']);
@@ -378,6 +384,10 @@ class GoodsClass extends BaseClass
         $sjId = $data['sjId'] ?? 0;
         $mainId = $data['mainId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
+        $status = $data['status'] ?? 0;
+        $delStatus = $data['delStatus'] ?? 0;
+        $setItemNum = isset($data['setItemNum']) && is_numeric($data['setItemNum']) ? $data['setItemNum'] : $preSetItemNum;
+        $flowerNum = $data['flowerNum'] ?? 0;
         $categoryData = CategoryClass::getCategory($mainId);
         $hasCategoryIds = array_keys($categoryData);
         $diff = array_diff($categoryIdList, $hasCategoryIds);
@@ -399,7 +409,11 @@ class GoodsClass extends BaseClass
                 'cName' => $cName,
                 'sjId' => $sjId,
                 'flower' => $flower,
-                'mainId' => $mainId
+                'mainId' => $mainId,
+                'status' => $status,
+                'delStatus' => $delStatus,
+                'setItemNum' => $setItemNum,
+                'flowerNum' => $flowerNum,
             ];
         }
         GoodsCategoryClass::batchAdd($addCategory);
@@ -413,7 +427,7 @@ class GoodsClass extends BaseClass
 
         $itemList = $data['itemList'] ?? '';
         $itemArr = json_decode($itemList, true);
-        if ($setItemNum == 0 && !empty($itemArr)) {
+        if ($preSetItemNum == 0 && !empty($itemArr)) {
             GoodsItemClass::deleteByCondition(['goodsId' => $id]);
             foreach ($itemArr as $item) {
                 $goodsItemData = [
@@ -534,6 +548,7 @@ class GoodsClass extends BaseClass
             $sjId = $goodsData['sjId'] ?? 0;
             $orderSn = $params['orderSn'] ?? '';
             $orderId = $params['orderId'] ?? 0;
+            $shopId = $params['shopId'] ?? 0;
             $hasReachTime = 0;
             $reachPeriod = 0;
             $reachDate = '0000-00-00';
@@ -558,6 +573,7 @@ class GoodsClass extends BaseClass
                 'hasReachTime' => $hasReachTime,
                 'reachPeriod' => $reachPeriod,
                 'reachDate' => $reachDate,
+                'shopId' => $shopId,
             ];
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {

biz-hd/goods/services/GoodsCategoryService.php

@@ -27,53 +27,6 @@ class GoodsCategoryService extends BaseService
         return $data;
     }
 
-    //查询指定分类下的商品，没有分页，首页使用 ssh 2019.12.2
-    public static function getAppointCategoryList($category)
-    {
-        $ids = array_column($category, 'id');
-        //取出分类下的商品id
-        $list = GoodsCategoryClass::getAllByCondition(['cId' => ['in', $ids]], 'inTurn DESC,addTime DESC', '*');
-        if (empty($list)) {
-            foreach ($category as $key => $val) {
-                $category[$key]['goodsInfoList'] = [];
-            }
-            return $category;
-        }
-        $goodsList = [];
-        $categoryGoods = [];
-        foreach ($list as $val) {
-            $goodsList[] = $val['gId'];
-            $cId = $val['cId'];
-            $categoryGoods[$cId][] = $val['gId'];
-        }
-        //查出商品信息
-        $goodsInfoList = GoodsService::getAllByCondition(['id' => ['in', $goodsList]], 'inTurn DESC', '*', 'id');
-        $goodsInfoList = GoodsClass::groupGoodsBaseInfo($goodsInfoList);
-
-        //每个分类取的商品数
-        $getNum = [6, 2, 4];
-        $showRowNum = [2, 1, 2];
-
-        foreach ($category as $key => $val) {
-            $id = $val['id'];
-            //当前分类下有哪些商品id，并组合商品信息
-            $categoryGoodsIdList = isset($categoryGoods[$id]) ? $categoryGoods[$id] : [];
-            $info = [];
-            if (!empty($categoryGoodsIdList)) {
-                $currentGetNum = isset($getNum[$key]) ? $getNum[$key] : 2;
-                $categoryGoodsIdList = array_slice($categoryGoodsIdList, 0, $currentGetNum);
-                foreach ($categoryGoodsIdList as $currentGoodsId) {
-                    if (isset($goodsInfoList[$currentGoodsId])) {
-                        $info[] = $goodsInfoList[$currentGoodsId];
-                    }
-                }
-            }
-            $category[$key]['goodsInfoList'] = $info;
-            $category[$key]['showRow'] = isset($showRowNum[$key]) ? $showRowNum[$key] : 2;
-        }
-        return $category;
-    }
-
     //获取商品所属的分类id  ssh 201917
     public static function getGoodsHasCategoryIds($goodsId)
     {

biz-mall/goods/services/GoodsCategoryService.php

@@ -28,7 +28,7 @@ class GoodsCategoryService extends BaseService
     }
 
     //查询指定分类下的商品，没有分页，首页使用 ssh 2019.12.2
-    public static function getAppointCategoryList($category)
+    public static function getAppointCategoryList($category, $shop)
     {
         $ids = array_column($category, 'id');
 
@@ -36,8 +36,17 @@ class GoodsCategoryService extends BaseService
         $getNum = [6, 2, 4];
         $showRowNum = [2, 1, 2];
 
+        $stockModel = $shop->stockModel ?? 0;
+        if ($stockModel == 0) {
+            //管到扎的，可以查看所有上架的商品
+            $where = ['cId' => ['in', $ids], 'status' => 1];
+        } else {
+            //管到支的，查看所有上架并且花材数量设置好的商品
+            $where = ['cId' => ['in', $ids], 'status' => 1, 'setItemNum' => 1];
+        }
+
         //取出分类下的商品id
-        $list = GoodsCategoryClass::getAllByCondition(['cId' => ['in', $ids]], 'inTurn DESC,addTime DESC', '*');
+        $list = GoodsCategoryClass::getAllByCondition($where, 'inTurn DESC,addTime DESC', '*');
         if (empty($list)) {
             foreach ($category as $key => $val) {
                 $category[$key]['goodsInfoList'] = [];

biz-mall/order/classes/OrderGoodsClass.php

@@ -29,7 +29,7 @@ class OrderGoodsClass extends BaseClass
 
                 $goodsId = $goods->goodsId ?? 0;
                 $num = $goods->num ?? 0;
-                $params = ['orderId' => $orderId, 'orderSn' => $orderSn];
+                $params = ['orderId' => $orderId, 'orderSn' => $orderSn, 'shopId' => $shopId];
                 $flower = $goods->flower ?? 0;
                 //鲜花类不需要验证库存，库存可以负数，并相应生成制作单
                 $checkStock = $flower == 0 ? true : false;