开单

app-mall/controllers/OrderController.php

@@ -161,10 +161,12 @@ class OrderController extends BaseController
             $orderId = $order['id'];
             $orderSn = $order['orderSn'];
             $currentCover = isset($goodsInfo['shortImgList']) && !empty($goodsInfo['shortImgList']) ? current($goodsInfo['shortImgList']) : '';
+            $flower = $goodsInfo['flower'] ?? 0;
             $price = bcmul($goodsNum, $unitPrice, 2);
             $data = [
                 'orderId' => $orderId,
                 'goodsId' => $goodsId,
+                'flower' => $flower,
                 'userId' => $this->userId,
                 'sjId' => $this->sjId,
                 'mainId' => $mainId,

biz-hd/order/services/OrderService.php

@@ -130,6 +130,7 @@ class OrderService extends BaseService
             if ($property == dict::getDict('property', 'goods')) {
                 $name = $goodsInfo[$currentId]['name'] ?? '';
                 $cover = $goodsInfo[$currentId]['cover'] ?? '';
+                $flower = $goodsInfo[$currentId]['flower'] ?? 0;
                 if (!empty($groupCover)) {
                     $groupCover = $cover;
                 }
@@ -140,6 +141,7 @@ class OrderService extends BaseService
                 $currentGoodsData = [
                     'orderSn' => $orderSn,
                     'goodsId' => $currentId,
+                    'flower' => $flower,
                     'customId' => $customId,
                     'hdId' => $hdId,
                     'sjId' => $sjId,

biz-mall/order/classes/OrderGoodsClass.php

@@ -27,11 +27,13 @@ class OrderGoodsClass extends BaseClass
         if (!empty($goodsList)) {
             foreach ($goodsList as $goods) {
 
-                //搜索关键词GoodsStockRecordClass::sellGoods，可以找到相同的方法
                 $goodsId = $goods->goodsId ?? 0;
                 $num = $goods->num ?? 0;
                 $params = ['orderId' => $orderId, 'orderSn' => $orderSn];
-                $respond = GoodsClass::decreaseStock($goodsId, $mainId, $num, false, $params);
+                $flower = $goods->flower ?? 0;
+                //鲜花类不需要验证库存，库存可以负数，并相应生成制作单
+                $checkStock = $flower == 0 ? true : false;
+                $respond = GoodsClass::decreaseStock($goodsId, $mainId, $num, $checkStock, $params);
                 $oldStock = $respond['oldStock'] ?? 0;
                 $newStock = $respond['newStock'] ?? 0;
                 $data = [];
@@ -44,6 +46,7 @@ class OrderGoodsClass extends BaseClass
                 $data['oldStock'] = $oldStock;
                 $data['newStock'] = $newStock;
                 $data['relateName'] = $customName;
+                //搜索关键词GoodsStockRecordClass::sellGoods，可以找到相同的方法，暂时没有写在一起
                 GoodsStockRecordClass::sellGoods($data);
 
             }

biz-mall/order/services/OrderService.php

@@ -94,6 +94,7 @@ class OrderService extends BaseService
             if ($property == dict::getDict('property', 'goods')) {
                 $name = $goodsInfo[$currentId]['name'] ?? '';
                 $cover = $goodsInfo[$currentId]['cover'] ?? '';
+                $flower = $goodsInfo[$currentId]['flower'] ?? 0;
                 if (!empty($groupCover)) {
                     $groupCover = $cover;
                 }
@@ -106,6 +107,7 @@ class OrderService extends BaseService
                 $currentGoodsData = [
                     'orderSn' => $orderSn,
                     'goodsId' => $currentId,
+                    'flower' => $flower,
                     'customId' => $customId,
                     'hdId' => $hdId,
                     'sjId' => $sjId,