Browse Source

制作单

shish 4 years ago
parent
commit
ca510fb59b
2 changed files with 3 additions and 1 deletions
  1. 2 0
      biz-hd/goods/classes/GoodsClass.php
  2. 1 1
      biz-mall/order/classes/OrderGoodsClass.php

+ 2 - 0
biz-hd/goods/classes/GoodsClass.php

@@ -548,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';
@@ -572,6 +573,7 @@ class GoodsClass extends BaseClass
                 'hasReachTime' => $hasReachTime,
                 'reachPeriod' => $reachPeriod,
                 'reachDate' => $reachDate,
+                'shopId' => $shopId,
             ];
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {

+ 1 - 1
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;